added logic back in that i didn't think i needed.

JumpMind · Aug 2, 2014 · 8505abf · 8505abf
1 parent 419bf5a
commit 8505abf
Showing 1 changed file with 8 additions and 3 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
@@ -205,15 +205,20 @@ protected void insertInitialLoadEvents() {
                                 for (NodeSecurity security : nodeSecurities) {                                    
                                     if (engine.getTriggerRouterService()
                                             .getActiveTriggerHistories().size() > 0) {
+                                        boolean thisMySecurityRecord = security.getNodeId().equals(
+                                                identity.getNodeId());
                                         boolean reverseLoadQueued = security
                                                 .isRevInitialLoadEnabled();
                                         boolean initialLoadQueued = security.isInitialLoadEnabled();
                                         boolean registered = security.getRegistrationTime() != null;
-                                        if (reverseLoadQueued
+                                        boolean parent = identity.getNodeId().equals(
+                                                security.getCreatedAtNodeId()) || 
+                                                engine.getConfigurationService().isMasterToMaster();
+                                        if (thisMySecurityRecord && reverseLoadQueued
                                                 && (reverseLoadFirst || !initialLoadQueued)) {
                                             sendReverseInitialLoad();
-                                        } else if (registered 
-                                                && initialLoadQueued
+                                        } else if (!thisMySecurityRecord && registered 
+                                                && initialLoadQueued && parent
                                                 && (!reverseLoadFirst || !reverseLoadQueued)) {
                                             long ts = System.currentTimeMillis();
                                             engine.getDataService().insertReloadEvents(