From 26a7a2181887e4e548248ec41cb8f19c3ae50847 Mon Sep 17 00:00:00 2001
From: chenson42 <chenson42@gmail.com>
Date: Sat, 2 Aug 2014 13:21:58 +0000
Subject: [PATCH] 0001857: Initial load is broken for the master to master sync
 scenario

---
 .../jumpmind/symmetric/service/impl/RouterService.java | 10 ++++++----
 1 file changed, 6 insertions(+), 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
index 7987f09f2a..8f1d9ae0bd 100644
--- 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);
             }
         }