From 76f058edacc843a9ff9a57691a7934c6dbfd82da Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Fri, 18 Mar 2011 10:41:49 +0100 Subject: [PATCH] Fixing stall issue in remote pipeline --- .../main/scala/akka/remote/netty/NettyRemoteSupport.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala index 6e5a2f3df3..8556f8e7ac 100644 --- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala +++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala @@ -860,7 +860,7 @@ class RemoteServerHandler( val actorInfo = request.getActorInfo val actorRef = - try { createActor(actorInfo, channel).start } catch { + try { createActor(actorInfo, channel) } catch { case e: SecurityException => EventHandler notify EventHandler.Error(e, this) write(channel, createErrorReplyMessage(e, request, AkkaActorType.ScalaActor)) @@ -1031,7 +1031,7 @@ class RemoteServerHandler( val actorRef = factory() actorRef.uuid = parseUuid(uuid) //FIXME is this sensible? sessionActors.get(channel).put(id, actorRef) - actorRef + actorRef.start //Start it where's it's created } case sessionActor => sessionActor } @@ -1055,7 +1055,7 @@ class RemoteServerHandler( actorRef.id = id actorRef.timeout = timeout server.actorsByUuid.put(actorRef.uuid.toString, actorRef) // register by uuid - actorRef + actorRef.start //Start it where it's created } catch { case e: Throwable => EventHandler notify EventHandler.Error(e, this)