From 24c115547d43c2aa142324214c308480a7c7043b Mon Sep 17 00:00:00 2001 From: Helena Edelson Date: Wed, 10 Oct 2012 09:58:18 -0600 Subject: [PATCH 1/2] 2609 Typo in method name for ClusterRouteeProvider --- .../main/scala/akka/cluster/routing/ClusterRouterConfig.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala index 52a9a55e21..eaaaa2c4a5 100644 --- a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala +++ b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala @@ -196,7 +196,7 @@ private[akka] class ClusterRouteeProvider( private def selectDeploymentTarget: Option[Address] = { val currentRoutees = routees - val currentNodes = availbleNodes + val currentNodes = availableNodes if (currentNodes.isEmpty || currentRoutees.size >= settings.totalInstances) { None } else { @@ -222,7 +222,7 @@ private[akka] class ClusterRouteeProvider( case a ⇒ a } - private[routing] def availbleNodes: SortedSet[Address] = { + private[routing] def availableNodes: SortedSet[Address] = { import Member.addressOrdering val currentNodes = nodes if (currentNodes.isEmpty && settings.allowLocalRoutees) From 61481da6cd57cdd794094a4b8f89c287dcee0286 Mon Sep 17 00:00:00 2001 From: Helena Edelson Date: Wed, 10 Oct 2012 10:05:41 -0600 Subject: [PATCH 2/2] 2609 Fixed more 'available' typos in ClusterRouteeProvider --- .../scala/akka/cluster/routing/ClusterRouterConfig.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala index eaaaa2c4a5..bdbb1297fb 100644 --- a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala +++ b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala @@ -236,11 +236,11 @@ private[akka] class ClusterRouteeProvider( private[routing] var nodes: SortedSet[Address] = { import Member.addressOrdering cluster.readView.members.collect { - case m if isAvailble(m) ⇒ m.address + case m if isAvailable(m) ⇒ m.address } } - private[routing] def isAvailble(m: Member): Boolean = { + private[routing] def isAvailable(m: Member): Boolean = { m.status == MemberStatus.Up && (settings.allowLocalRoutees || m.address != cluster.selfAddress) } @@ -271,10 +271,10 @@ private[akka] class ClusterRouterActor extends Router { override def routerReceive: Receive = { case s: CurrentClusterState ⇒ import Member.addressOrdering - routeeProvider.nodes = s.members.collect { case m if routeeProvider.isAvailble(m) ⇒ m.address } + routeeProvider.nodes = s.members.collect { case m if routeeProvider.isAvailable(m) ⇒ m.address } routeeProvider.createRoutees() - case m: MemberEvent if routeeProvider.isAvailble(m.member) ⇒ + case m: MemberEvent if routeeProvider.isAvailable(m.member) ⇒ routeeProvider.nodes += m.member.address // createRoutees will create routees based on // totalInstances and maxInstancesPerNode