Merge branch '3.9' of https://github.com/JumpMind/symmetric-ds.git in…

…to 3.9
JumpMind · Apr 9, 2018 · bccdeea · bccdeea
2 parents 154c7d3 + d730caf
commit bccdeea
Showing 1 changed file with 8 additions and 3 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
@@ -496,9 +496,10 @@ public void insertReloadEvents(Node targetNode, boolean reverse, List<TableReloa
                                 triggerHistories, triggerRoutersByHistoryId, 
                                 mapReloadRequests, isFullLoad, symNodeSecurityReloadChannel);
 
+                        insertFileSyncBatchForReload(targetNode, loadId, createBy, transactional,
+                                transaction, mapReloadRequests, isFullLoad, processInfo);
+
                         if (isFullLoad) {
-                            insertFileSyncBatchForReload(targetNode, loadId, createBy, transactional,
-                                    transaction, processInfo);
 
                             callReloadListeners(false, targetNode, transactional, transaction, loadId);
                             if (!reverse) {
@@ -984,7 +985,7 @@ protected int getTransformMultiplier(Table table, TriggerRouter triggerRouter) {
     }
 
     private void insertFileSyncBatchForReload(Node targetNode, long loadId, String createBy,
-            boolean transactional, ISqlTransaction transaction, ProcessInfo processInfo) {
+            boolean transactional, ISqlTransaction transaction, Map<String, TableReloadRequest> reloadRequests, boolean isFullLoad, ProcessInfo processInfo) {
         if (parameterService.is(ParameterConstants.FILE_SYNC_ENABLE)
                 && !Constants.DEPLOYMENT_TYPE_REST.equals(targetNode.getDeploymentType())) {
             ITriggerRouterService triggerRouterService = engine.getTriggerRouterService();
@@ -999,6 +1000,10 @@ private void insertFileSyncBatchForReload(Node targetNode, long loadId, String c
                 TriggerRouter fileSyncSnapshotTriggerRouter = triggerRouterService
                         .getTriggerRouterForCurrentNode(fileSyncSnapshotHistory.getTriggerId(),
                                 routerid, true);
+
+                if(!isFullLoad && reloadRequests != null && reloadRequests.get(fileSyncSnapshotTriggerRouter.getTriggerId() + fileSyncSnapshotTriggerRouter.getRouterId()) == null){
+                    return;
+                }
 
                 List<TriggerHistory> triggerHistories = Arrays.asList(fileSyncSnapshotHistory);
                 List<TriggerRouter> triggerRouters = Arrays.asList(fileSyncSnapshotTriggerRouter);