0003285: Move loading of trigger_routers to more specific execution

branch to reduce unneeded db calls
JumpMind · Oct 18, 2017 · 15611f9 · 15611f9
1 parent 50da75c
commit 15611f9
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java
@@ -259,12 +259,6 @@ protected void insertInitialLoadEvents() {
                         for (NodeSecurity security : nodeSecurities) {
                             if (activeHistories.size() > 0) {
                                 Node targetNode = engine.getNodeService().findNode(security.getNodeId());
-                                List<TriggerRouter> triggerRouters = triggerRoutersByTargetNodeGroupId.get(targetNode.getNodeGroupId());
-                                if (triggerRouters == null) {
-                                    triggerRouters = triggerRouterService.getAllTriggerRoutersForReloadForCurrentNode(parameterService.getNodeGroupId(), targetNode.getNodeGroupId());
-                                    triggerRoutersByTargetNodeGroupId.put(targetNode.getNodeGroupId(), triggerRouters);
-                                }
-
                                 boolean thisMySecurityRecord = security.getNodeId().equals(
                                         identity.getNodeId());
                                 boolean reverseLoadQueued = security.isRevInitialLoadEnabled();
@@ -276,6 +270,11 @@ protected void insertInitialLoadEvents() {
                                 } else if (!thisMySecurityRecord && registered && initialLoadQueued
                                         &&  (!reverseLoadFirst || !reverseLoadQueued)) {
                                     long ts = System.currentTimeMillis();
+                                    List<TriggerRouter> triggerRouters = triggerRoutersByTargetNodeGroupId.get(targetNode.getNodeGroupId());
+                                    if (triggerRouters == null) {
+                                        triggerRouters = triggerRouterService.getAllTriggerRoutersForReloadForCurrentNode(parameterService.getNodeGroupId(), targetNode.getNodeGroupId());
+                                        triggerRoutersByTargetNodeGroupId.put(targetNode.getNodeGroupId(), triggerRouters);
+                                    }                                    
                                     dataService.insertReloadEvents(
                                             targetNode,
                                             false, processInfo, activeHistories, triggerRouters);