raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'master' into pluggable-serializer

Browse source
This commit is contained in:
Jonas Bonér 2011-06-14 14:41:24 +02:00
commit 04bf416ead
80 changed files with 1366 additions and 789 deletions
Download patch file Download diff file Expand all files Collapse all files

7
akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
View file

@ -4,7 +4,7 @@
package akka.remote.netty
import akka.dispatch.{ DefaultPromise, Promise, Future }
import akka.dispatch.{ ActorPromise, DefaultPromise, Promise, Future }
import akka.remote.{ MessageSerializer, RemoteClientSettings, RemoteServerSettings }
import akka.remote.protocol.RemoteProtocol._
import akka.serialization.RemoteActorSerialization
@ -917,8 +917,7 @@ class RemoteServerHandler(
else actorRef.postMessageToMailboxAndCreateFutureResultWithTimeout(
message,
request.getActorInfo.getTimeout,
None,
Some(new DefaultPromise[Any](request.getActorInfo.getTimeout).
new ActorPromise(request.getActorInfo.getTimeout).
onComplete(_.value.get match {
case l: Left[Throwable, Any] ⇒ write(channel, createErrorReplyMessage(l.a, request))
case r: Right[Throwable, Any] ⇒
@ -935,7 +934,7 @@ class RemoteServerHandler(
if (request.hasSupervisorUuid) messageBuilder.setSupervisorUuid(request.getSupervisorUuid)
write(channel, RemoteEncoder.encode(messageBuilder.build))
})))
}))
}
}