0003359: Safeguard against initial.load.delete being routed to the wrong

node
JumpMind · Jan 9, 2018 · 6cd07c7 · 6cd07c7
1 parent 0526fee
commit 6cd07c7
Showing 1 changed file with 2 additions and 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
@@ -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);
         }
     }