make sure file sync reload event is on the filesync channel

JumpMind · Jul 8, 2013 · dbfae8c · dbfae8c
1 parent a187a99
commit dbfae8c
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
@@ -405,7 +405,7 @@ public void insertReloadEvents(Node targetNode, boolean reverse) {
                                 fileSyncSnapshotHistory.getTriggerId(), true);
                 // file sync reload event needs to be on the file sync channel to be processed
                 insertReloadEvent(transaction, targetNode, fileSyncSnapshotTriggerRouter,
-                        fileSyncSnapshotHistory, null, false, loadId, createBy);
+                        fileSyncSnapshotHistory, null, true, loadId, createBy);
                 if (!transactional) {
                     transaction.commit();
                 }
@@ -748,7 +748,7 @@ protected void insertDataEventAndOutgoingBatch(ISqlTransaction transaction, long
             String channelId, String nodeId, DataEventType eventType, String routerId,
             boolean isLoad, long loadId, String createBy) {
         boolean useReloadChannel = parameterService.is(ParameterConstants.INITIAL_LOAD_USE_RELOAD_CHANNEL);
-        channelId = useReloadChannel && isLoad ? Constants.CHANNEL_RELOAD : channelId;
+        channelId = useReloadChannel && isLoad && !Constants.CHANNEL_FILESYNC.equals(channelId) ? Constants.CHANNEL_RELOAD : channelId;
         OutgoingBatch outgoingBatch = new OutgoingBatch(
                 nodeId,
                 channelId, Status.NE);