From a3ecb233bbc105bdca8bea497e80b44803387d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Fri, 10 Dec 2010 08:59:35 +0100 Subject: [PATCH] fixed bug in which the default configuration timeout was always overridden by 5000L --- .../src/main/scala/akka/remote/RemoteClient.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/akka-remote/src/main/scala/akka/remote/RemoteClient.scala b/akka-remote/src/main/scala/akka/remote/RemoteClient.scala index 8cc87a521f..2b137d8788 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteClient.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteClient.scala @@ -77,16 +77,16 @@ object RemoteClient extends Logging { private val remoteActors = new HashMap[Address, HashSet[Uuid]] def actorFor(classNameOrServiceId: String, hostname: String, port: Int): ActorRef = - actorFor(classNameOrServiceId, classNameOrServiceId, 5000L, hostname, port, None) + actorFor(classNameOrServiceId, classNameOrServiceId, Actor.TIMEOUT, hostname, port, None) def actorFor(classNameOrServiceId: String, hostname: String, port: Int, loader: ClassLoader): ActorRef = - actorFor(classNameOrServiceId, classNameOrServiceId, 5000L, hostname, port, Some(loader)) + actorFor(classNameOrServiceId, classNameOrServiceId, Actor.TIMEOUT, hostname, port, Some(loader)) def actorFor(serviceId: String, className: String, hostname: String, port: Int): ActorRef = - actorFor(serviceId, className, 5000L, hostname, port, None) + actorFor(serviceId, className, Actor.TIMEOUT, hostname, port, None) def actorFor(serviceId: String, className: String, hostname: String, port: Int, loader: ClassLoader): ActorRef = - actorFor(serviceId, className, 5000L, hostname, port, Some(loader)) + actorFor(serviceId, className, Actor.TIMEOUT, hostname, port, Some(loader)) def actorFor(classNameOrServiceId: String, timeout: Long, hostname: String, port: Int): ActorRef = actorFor(classNameOrServiceId, classNameOrServiceId, timeout, hostname, port, None) @@ -98,7 +98,7 @@ object RemoteClient extends Logging { RemoteActorRef(serviceId, className, hostname, port, timeout, None) def typedActorFor[T](intfClass: Class[T], serviceIdOrClassName: String, hostname: String, port: Int): T = { - typedActorFor(intfClass, serviceIdOrClassName, serviceIdOrClassName, 5000L, hostname, port, None) + typedActorFor(intfClass, serviceIdOrClassName, serviceIdOrClassName, Actor.TIMEOUT, hostname, port, None) } def typedActorFor[T](intfClass: Class[T], serviceIdOrClassName: String, timeout: Long, hostname: String, port: Int): T = {