Merge remote-tracking branch 'origin/3.3' into 3.4

phasenraum2010 · Dec 5, 2017 · 14d511c · 14d511c
2 parents 86fc858 + 982bea5
commit 14d511c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...ring/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java b/...ring/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java
@@ -336,16 +336,16 @@ private synchronized void refreshTopology() throws InterruptedException
     private void refreshCoreTopology() throws InterruptedException
     {
         waitOnHazelcastInstanceCreation();
+
         CoreTopology newCoreTopology = getCoreTopology( hazelcastInstance, config, log );
         TopologyDifference difference = coreTopology.difference( newCoreTopology );
+        coreTopology = newCoreTopology;
+
         if ( difference.hasChanges() )
         {
             log.info( "Core topology changed %s", difference );
+            listenerService.notifyListeners( coreTopology );
         }
-
-        this.coreTopology = newCoreTopology;
-        listenerService.notifyListeners( this.coreTopology );
-
     }
 
     private void refreshReadReplicaTopology() throws InterruptedException