From 06ec519c7c8c8d0f6e139eb5b5417b9012ed8742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Wed, 29 Feb 2012 11:34:11 +0100 Subject: [PATCH] Reverted two lines of code mistakenly pushed to early. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonas BoneĢr --- .../src/main/scala/akka/cluster/Node.scala | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/akka-cluster/src/main/scala/akka/cluster/Node.scala b/akka-cluster/src/main/scala/akka/cluster/Node.scala index eb4142b066..055d7b3b7f 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Node.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Node.scala @@ -774,15 +774,15 @@ class Node(system: ActorSystemImpl) extends Extension { */ private def convergence(gossip: Gossip): Option[Gossip] = { val overview = gossip.overview - if (overview.unreachable.isEmpty) { // if there are any unreachable nodes then we can't have a convergence - - // waiting for user to act (issuing DOWN) or leader to act (issuing DOWN through auto-down) - val seen = gossip.overview.seen - val views = Set.empty[VectorClock] ++ seen.values - if (views.size == 1) { - log.debug("Node [{}] - Cluster convergence reached", remoteAddress) - Some(gossip) - } else None + // if (overview.unreachable.isEmpty) { // if there are any unreachable nodes then we can't have a convergence - + // waiting for user to act (issuing DOWN) or leader to act (issuing DOWN through auto-down) + val seen = gossip.overview.seen + val views = Set.empty[VectorClock] ++ seen.values + if (views.size == 1) { + log.debug("Node [{}] - Cluster convergence reached", remoteAddress) + Some(gossip) } else None + // } else None } /**