From ce9f530c325ed0bbc51f9f7649859cd2e743a2cf Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Thu, 5 Jul 2012 10:53:18 +0200 Subject: [PATCH] Fix bug in convergence, see #2317 --- akka-cluster/src/main/scala/akka/cluster/Cluster.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala index 86caf231c3..3b292b0d91 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala @@ -419,9 +419,7 @@ case class Gossip( val hasUnreachable = unreachable.nonEmpty && unreachable.exists { _.status != Down } val allMembersInSeen = members.forall(m ⇒ seen.contains(m.address)) - if (hasUnreachable) false - else if (!allMembersInSeen) true - else seen.values.toSet.size == 1 + !hasUnreachable && allMembersInSeen && (seen.values.toSet.size == 1) } def isLeader(address: Address): Boolean =