0002688: Heartbeats don't propagate properly in a multi-master situation

JumpMind · Jul 20, 2016 · 4ebe85e · 4ebe85e
1 parent 4ca05b7
commit 4ebe85e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...etric-core/src/main/java/org/jumpmind/symmetric/route/ConfigurationChangedDataRouter.java b/...etric-core/src/main/java/org/jumpmind/symmetric/route/ConfigurationChangedDataRouter.java
@@ -225,12 +225,14 @@ protected void routeNodeTables(Set<String> nodeIds, Map<String, String> columnVa
                 }
             }
         } else {
+            IConfigurationService configurationService = engine.getConfigurationService();
             List<NodeGroupLink> nodeGroupLinks = getNodeGroupLinksFromContext(routingContext);
             for (Node nodeThatMayBeRoutedTo : possibleTargetNodes) {
                 if (!Constants.DEPLOYMENT_TYPE_REST.equals(nodeThatMayBeRoutedTo.getDeploymentType())
                         && !nodeThatMayBeRoutedTo.requires13Compatiblity()
                         && isLinked(nodeIdForRecordBeingRouted, nodeThatMayBeRoutedTo, rootNetworkedNode, me, nodeGroupLinks)
-                        && !isSameNumberOfLinksAwayFromRoot(nodeThatMayBeRoutedTo, rootNetworkedNode, me)
+                        && (!isSameNumberOfLinksAwayFromRoot(nodeThatMayBeRoutedTo, rootNetworkedNode, me) 
+                                || configurationService.isMasterToMaster())
                         || (nodeThatMayBeRoutedTo.getNodeId().equals(me.getNodeId()) && initialLoad)) {
                     nodeIds.add(nodeThatMayBeRoutedTo.getNodeId());
                 }