From 6cd07c77acc02f79d1e94331d2ab753c41359ef7 Mon Sep 17 00:00:00 2001
From: mmichalek <mmichalek@jumpmind.com>
Date: Tue, 9 Jan 2018 15:23:13 -0500
Subject: [PATCH] 0003359: Safeguard against initial.load.delete being routed
 to the wrong node

---
 .../java/org/jumpmind/symmetric/service/impl/DataService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
index 146458db03..c2d29abb4d 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
@@ -1152,11 +1152,11 @@ protected void createPurgeEvent(ISqlTransaction transaction, String sql, Node ta
                 .getConfigurationService().getChannels(false));
         Data data = new Data(triggerHistory.getSourceTableName(), DataEventType.SQL,
                 CsvUtils.escapeCsvData(sql), null, triggerHistory, channelId, null, null);
+        data.setNodeList(targetNode.getNodeId());
         if (isLoad) {
             insertDataAndDataEventAndOutgoingBatch(transaction, data, targetNode.getNodeId(),
                     triggerRouter.getRouter().getRouterId(), isLoad, loadId, createBy, Status.NE, null, -1);
         } else {
-            data.setNodeList(targetNode.getNodeId());
             insertData(transaction, data);
         }
     }
@@ -1173,11 +1173,11 @@ public void insertSqlEvent(Node targetNode, String sql, boolean isLoad, long loa
         Data data = new Data(history.getSourceTableName(), DataEventType.SQL,
                 CsvUtils.escapeCsvData(sql), null, history, isLoad ? reloadChannelId
                         : Constants.CHANNEL_CONFIG, null, null);
+        data.setNodeList(targetNode.getNodeId());
         if (isLoad) {
             insertDataAndDataEventAndOutgoingBatch(data, targetNode.getNodeId(),
                     Constants.UNKNOWN_ROUTER_ID, isLoad, loadId, createBy);
         } else {
-            data.setNodeList(targetNode.getNodeId());
             insertData(data);
         }
     }