From ebb0d1a46dcc5ab6816393a55159a63591a6f492 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 17 Sep 2014 22:31:26 +0100
Subject: [PATCH] Handle invalid property values in Switch node Fixes #404

---
 nodes/core/logic/10-switch.js | 38 +++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/nodes/core/logic/10-switch.js b/nodes/core/logic/10-switch.js
index 237c83c39..8bcb85718 100644
--- a/nodes/core/logic/10-switch.js
+++ b/nodes/core/logic/10-switch.js
@@ -38,8 +38,8 @@ module.exports = function(RED) {
         this.rules = n.rules;
         this.property = n.property;
         this.checkall = n.checkall || "true";
-        var propertyParts = n.property.split("."),
-            node = this;
+        var propertyParts = n.property.split(".");
+        var node = this;
 
         for (var i=0; i<this.rules.length; i+=1) {
             var rule = this.rules[i];
@@ -51,23 +51,27 @@ module.exports = function(RED) {
 
         this.on('input', function (msg) {
             var onward = [];
-            var prop = propertyParts.reduce(function (obj, i) {
-                return obj[i]
-            }, msg);
-            var elseflag = true;
-            for (var i=0; i<node.rules.length; i+=1) {
-                var rule = node.rules[i];
-                var test = prop;
-                if (rule.t == "else") { test = elseflag; elseflag = true; }
-                if (operators[rule.t](test,rule.v, rule.v2)) {
-                    onward.push(msg);
-                    elseflag = false;
-                    if (node.checkall == "false") { break; }
-                } else {
-                    onward.push(null);
+            try {
+                var prop = propertyParts.reduce(function (obj, i) {
+                    return obj[i]
+                }, msg);
+                var elseflag = true;
+                for (var i=0; i<node.rules.length; i+=1) {
+                    var rule = node.rules[i];
+                    var test = prop;
+                    if (rule.t == "else") { test = elseflag; elseflag = true; }
+                    if (operators[rule.t](test,rule.v, rule.v2)) {
+                        onward.push(msg);
+                        elseflag = false;
+                        if (node.checkall == "false") { break; }
+                    } else {
+                        onward.push(null);
+                    }
                 }
+                this.send(onward);
+            } catch(err) {
+                node.warn(err);
             }
-            this.send(onward);
         });
     }
     RED.nodes.registerType("switch", SwitchNode);