Fixed bug where the 'choice' process incorrectly sent a 'merge' signal when no branches were activated

balis · balis · commit 100edd437061 · 2019-01-08T21:04:42.000+01:00
diff --git a/engine2/ProcChoiceFSM.js b/engine2/ProcChoiceFSM.js
@@ -132,7 +132,7 @@ var ChoiceLogic = function() {
         }
         // if there exists "merge" output, emit the 'merge' control signal first. 
         // see 'join' process for explanation
-        if (proc.ctrOuts.merge) {
+        if (proc.ctrOuts.merge && outValues.length) { // (don't send the signal if no branches are activated)
             var Nj = outValues.length, Nb = Nj; 
             proc.engine.emitSignals([{"_id": proc.ctrOuts.merge, "data": [{"Nb": Nb, "Nj": Nj}]}],
                     function(err) { });

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ var ChoiceLogic = function() {`
`132`	`132`	`}`
`133`	`133`	`// if there exists "merge" output, emit the 'merge' control signal first.`
`134`	`134`	`// see 'join' process for explanation`
`135`		`- if (proc.ctrOuts.merge) {`
	`135`	`+ if (proc.ctrOuts.merge && outValues.length) { // (don't send the signal if no branches are activated)`
`136`	`136`	`var Nj = outValues.length, Nb = Nj;`
`137`	`137`	`proc.engine.emitSignals([{"_id": proc.ctrOuts.merge, "data": [{"Nb": Nb, "Nj": Nj}]}],`
`138`	`138`	`function(err) { });`