From cb4f46decceaf39caf608838f1af01dcbbf5f51f Mon Sep 17 00:00:00 2001
From: Hiroki Uchikawa <31908137+HirokiUchikawa@users.noreply.github.com>
Date: Fri, 29 Sep 2017 03:09:54 +0900
Subject: [PATCH] Fix circular reference in join node (#1412)

and add a test case
---
 nodes/core/logic/17-split.js           |  3 +++
 test/nodes/core/logic/17-split_spec.js | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/nodes/core/logic/17-split.js b/nodes/core/logic/17-split.js
index f8dcb3910..ca18b50de 100644
--- a/nodes/core/logic/17-split.js
+++ b/nodes/core/logic/17-split.js
@@ -300,6 +300,9 @@ module.exports = function(RED) {
                 }
                 RED.util.setMessageProperty(group.msg,node.property,group.payload.join(groupJoinChar));
             } else {
+                if (node.propertyType === 'full') {
+                    group.msg = RED.util.cloneMessage(group.msg);
+                }
                 RED.util.setMessageProperty(group.msg,node.property,group.payload);
             }
             if (group.msg.hasOwnProperty('parts') && group.msg.parts.hasOwnProperty('parts')) {
diff --git a/test/nodes/core/logic/17-split_spec.js b/test/nodes/core/logic/17-split_spec.js
index a29313ae2..3412d6bc1 100644
--- a/test/nodes/core/logic/17-split_spec.js
+++ b/test/nodes/core/logic/17-split_spec.js
@@ -559,6 +559,31 @@ describe('JOIN node', function() {
         });
     });
 
+    it('should join complete message objects into an array after a count', function(done) {
+        var flow = [{id:"n1", type:"join", wires:[["n2"]], build:"array", timeout:0, count:3, propertyType:"full",mode:"custom"},
+                    {id:"n2", type:"helper"}];
+        helper.load(joinNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function(msg) {
+                try {
+                    msg.payload.should.be.an.Array();
+                    msg.payload[0].should.be.an.Object();
+                    msg.payload[0].should.have.property("payload","a");
+                    msg.payload[1].should.be.an.Object();
+                    msg.payload[1].should.have.property("payload","b");
+                    msg.payload[2].should.be.an.Object();
+                    msg.payload[2].should.have.property("payload","c");
+                    done();
+                }
+                catch(e) { done(e); }
+            });
+            n1.receive({payload:"a"});
+            n1.receive({payload:"b"});
+            n1.receive({payload:"c"});
+        });
+    });
+
     it('should join split things back into an array', function(done) {
         var flow = [{id:"n1", type:"join", wires:[["n2"]]},
                     {id:"n2", type:"helper"}];