From d75a5548cb44189cd33c6954cbb53d7a05f3521d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= <lukas@woehrl.net>
Date: Thu, 11 Jan 2018 16:27:01 +0100
Subject: [PATCH 1/2] do not extract files if unrelated table reload request is
 processed

---
 .../jumpmind/symmetric/service/impl/DataService.java  | 11 ++++++++---
 1 file changed, 8 insertions(+), 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
index 5d0e46fa61..cc680cc8ba 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
@@ -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, 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, 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(reloadRequests != null && reloadRequests.get(fileSyncSnapshotTriggerRouter.getTriggerId() + fileSyncSnapshotTriggerRouter.getRouterId()) == null){
+                    return;
+                }
                 
                 List<TriggerHistory> triggerHistories = Arrays.asList(fileSyncSnapshotHistory);
                 List<TriggerRouter> triggerRouters = Arrays.asList(fileSyncSnapshotTriggerRouter);

From 1779b3e6661130c770cf0bda7be425ff21e23e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= <lukas@woehrl.net>
Date: Mon, 9 Apr 2018 15:55:36 +0200
Subject: [PATCH 2/2] add support for full load

---
 .../org/jumpmind/symmetric/service/impl/DataService.java    | 6 +++---
 1 file changed, 3 insertions(+), 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
index cc680cc8ba..e7e20f2d59 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
@@ -497,7 +497,7 @@ public void insertReloadEvents(Node targetNode, boolean reverse, List<TableReloa
                                 mapReloadRequests, isFullLoad, symNodeSecurityReloadChannel);
 
                         insertFileSyncBatchForReload(targetNode, loadId, createBy, transactional,
-                                transaction, mapReloadRequests, processInfo);
+                                transaction, mapReloadRequests, isFullLoad, processInfo);
                                 
                         if (isFullLoad) {
 
@@ -985,7 +985,7 @@ protected int getTransformMultiplier(Table table, TriggerRouter triggerRouter) {
     }
 
     private void insertFileSyncBatchForReload(Node targetNode, long loadId, String createBy,
-            boolean transactional, ISqlTransaction transaction, Map<String, TableReloadRequest> reloadRequests, 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();
@@ -1001,7 +1001,7 @@ private void insertFileSyncBatchForReload(Node targetNode, long loadId, String c
                         .getTriggerRouterForCurrentNode(fileSyncSnapshotHistory.getTriggerId(),
                                 routerid, true);
 
-                if(reloadRequests != null && reloadRequests.get(fileSyncSnapshotTriggerRouter.getTriggerId() + fileSyncSnapshotTriggerRouter.getRouterId()) == null){
+                if(!isFullLoad && reloadRequests != null && reloadRequests.get(fileSyncSnapshotTriggerRouter.getTriggerId() + fileSyncSnapshotTriggerRouter.getRouterId()) == null){
                     return;
                 }