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

unify sender/senderFuture into channel (++)

Browse source 
(squashed merge from the various bits and pieces already part of
release-1.2, everything related to Channel & Future)
This commit is contained in:
Roland 2011-06-13 22:36:46 +02:00
parent cee934a99a
commit 7712c20620
28 changed files with 679 additions and 252 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
@ -913,8 +913,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] ⇒
@ -931,7 +930,7 @@ class RemoteServerHandler(
if (request.hasSupervisorUuid) messageBuilder.setSupervisorUuid(request.getSupervisorUuid)
write(channel, RemoteEncoder.encode(messageBuilder.build))
})))
}))
}
}