0001857: Initial load is broken for the master to master sync scenario

JumpMind · Aug 2, 2014 · 26a7a21 · 26a7a21
1 parent 8505abf
commit 26a7a21
Showing 1 changed file with 6 additions and 4 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
@@ -269,10 +269,12 @@ public List<NodeSecurity> findNodesThatAreReadyForInitialLoad() {
         List<NodeSecurity> toReturn = new ArrayList<NodeSecurity>();
         List<NodeSecurity> securities = nodeService.findNodeSecurityWithLoadEnabled();
         for (NodeSecurity nodeSecurity : securities) {
-            if (!nodeSecurity.getNodeId().equals(me) &&
-                    ((me.equals(nodeSecurity.getCreatedAtNodeId()) && nodeSecurity.isInitialLoadEnabled()) ||
-                        configurationService.isMasterToMaster() ||
-                        (!me.equals(nodeSecurity.getCreatedAtNodeId()) && nodeSecurity.isRevInitialLoadEnabled()))) {
+            if (((!nodeSecurity.getNodeId().equals(me)
+                    && me.equals(nodeSecurity.getCreatedAtNodeId()) && nodeSecurity
+                        .isInitialLoadEnabled())
+                    || (!nodeSecurity.getNodeId().equals(me) && configurationService
+                            .isMasterToMaster()) || (nodeSecurity.getNodeId().equals(me) && nodeSecurity
+                    .isRevInitialLoadEnabled()))) {
                 toReturn.add(nodeSecurity);
             }
         }