frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Treat missing msg properties as undefined rather than throw error

Browse Source 
Fixes #1167
This commit is contained in:
Nick O'Leary
2017-03-02 14:02:26 +00:00
parent d25dac69d2
commit 5945be95cf
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nodes/core/logic/10-switch.js
View File

@@ -125,7 +125,11 @@ module.exports = function(RED) {
return;
}
} else {
v1 = RED.util.evaluateNodeProperty(rule.v,rule.vt,node,msg);
try {
v1 = RED.util.evaluateNodeProperty(rule.v,rule.vt,node,msg);
} catch(err) {
v1 = undefined;
}
}
v2 = rule.v2;
if (rule.v2t === 'prev') {
@@ -138,7 +142,11 @@ module.exports = function(RED) {
return;
}
} else if (typeof v2 !== 'undefined') {
v2 = RED.util.evaluateNodeProperty(rule.v2,rule.v2t,node,msg);
try {
v2 = RED.util.evaluateNodeProperty(rule.v2,rule.v2t,node,msg);
} catch(err) {
v2 = undefined;
}
}
if (rule.t == "else") { test = elseflag; elseflag = true; }
if (operators[rule.t](test,v1,v2,rule.case)) {