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

Fixed bug in remote actors + improved scaladoc

Browse source
This commit is contained in:
Jonas Bonér 2010-06-04 15:58:26 +02:00
parent 02af674a96
commit 43aecb6e42
9 changed files with 21 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

10
akka-core/src/main/scala/remote/RemoteServer.scala
View file

@ -364,12 +364,12 @@ class RemoteServerHandler(
val actorRef = createActor(request.getTarget, request.getUuid, request.getTimeout)
actorRef.start
val message = RemoteProtocolBuilder.getMessage(request)
if (request.hasSender) {
val sender = request.getSender
if (sender ne null) actorRef.!(message)(Some(ActorRef.fromProtobuf(sender, applicationLoader)))
} else {
val sender = if (request.hasSender) Some(ActorRef.fromProtobuf(request.getSender, applicationLoader))
else None
if (request.getIsOneWay) actorRef.!(message)(sender)
else {
try {
val resultOrNone = actorRef !! message
val resultOrNone = actorRef.!!(message)(sender)
val result: AnyRef = if (resultOrNone.isDefined) resultOrNone.get else null
log.debug("Returning result from actor invocation [%s]", result)
val replyBuilder = RemoteReplyProtocol.newBuilder