From f855ff2addb762720d1e9ca40ae07c70a1f9831c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Sat, 4 Feb 2012 17:50:11 +0100 Subject: [PATCH] Fixed misc stuff after review. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonas Bonér --- akka-actor/src/main/scala/akka/AkkaException.scala | 4 ++-- akka-actor/src/main/scala/akka/routing/Routing.scala | 3 +++ .../akka/remote/AbstractRemoteActorMultiJvmSpec.scala | 11 +++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/akka-actor/src/main/scala/akka/AkkaException.scala b/akka-actor/src/main/scala/akka/AkkaException.scala index 7a6ba39daa..d12a491a0a 100644 --- a/akka-actor/src/main/scala/akka/AkkaException.scala +++ b/akka-actor/src/main/scala/akka/AkkaException.scala @@ -8,10 +8,10 @@ import akka.actor.newUuid import java.net.{ InetAddress, UnknownHostException } object AkkaException { - val hostname = try InetAddress.getLocalHost.getHostAddress catch { case e: UnknownHostException ⇒ "unknown" } + val hostname = try InetAddress.getLocalHost.getHostAddress catch { case e: UnknownHostException ⇒ "unknown host" } def toStringWithStackTrace(throwable: Throwable): String = { - if (throwable eq null) "Unknown Exception" + if (throwable eq null) "Unknown Throwable: was 'null'" throwable match { case ae: AkkaException ⇒ ae.toLongString case e ⇒ "%s:%s\n%s" format (e.getClass.getName, e.getMessage, stackTraceToString(e)) diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala index 6739c6341b..c76ddfc4a5 100644 --- a/akka-actor/src/main/scala/akka/routing/Routing.scala +++ b/akka-actor/src/main/scala/akka/routing/Routing.scala @@ -728,6 +728,9 @@ case class ScatterGatherFirstCompletedRouter(nrOfInstances: Int = 0, routees: It override val resizer: Option[Resizer] = None) extends RouterConfig with ScatterGatherFirstCompletedLike { + if (within.length <= 0) throw new IllegalArgumentException( + "[within: Duration] can not be zero or negative, was [" + within + "]") + /** * Constructor that sets nrOfInstances to be created. * Java API diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala index 9e647e20f7..ab8bdadae6 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala @@ -5,22 +5,25 @@ import com.typesafe.config.{Config, ConfigFactory} trait AbstractRemoteActorMultiJvmSpec { def NrOfNodes: Int def commonConfig: Config + def PortRangeStart = 1990 + def NodeRange = 1 to NrOfNodes + def PortRange = PortRangeStart to NrOfNodes private[this] val remotes: IndexedSeq[String] = { val nodesOpt = Option(AkkaRemoteSpec.testNodes).map(_.split(",").toIndexedSeq) nodesOpt getOrElse IndexedSeq.fill(NrOfNodes)("localhost") } - val nodeConfigs = ((1 to NrOfNodes).toList zip remotes) map { - case (idx, host) => + val nodeConfigs = (NodeRange.toList zip remotes) map { + case (port, host) => ConfigFactory.parseString(""" akka { remote.netty.hostname="%s" remote.netty.port = "%d" - }""".format(host, PortRangeStart + idx, idx)) withFallback commonConfig + }""".format(host, PortRangeStart + port, port)) withFallback commonConfig } - def akkaSpec(idx: Int) = "AkkaRemoteSpec@%s:%d".format(remotes(idx), PortRangeStart + 1 + idx) + def akkaSpec(port: Int) = "AkkaRemoteSpec@%s:%d".format(remotes(port), PortRangeStart + 1 + port) def akkaURIs(count: Int): String = 0 until count map {idx => "\"akka://" + akkaSpec(idx) + "\""} mkString "," }