re #281: Removed type parameter from ActorRef.!! which now returns Option[Any] and added Helpers.narrow and Helpers.narrowSilently.

This commit is contained in:
Heiko Seeberger 2010-06-18 16:31:25 +02:00
parent 171888c081
commit 4ba1c584f1
12 changed files with 61 additions and 30 deletions

View file

@ -11,6 +11,7 @@ import java.util.{Map => JMap}
import se.scalablesolutions.akka.actor._
import se.scalablesolutions.akka.util._
import se.scalablesolutions.akka.util.Helpers.narrow
import se.scalablesolutions.akka.remote.protobuf.RemoteProtocol._
import se.scalablesolutions.akka.config.Config.config
@ -369,8 +370,8 @@ class RemoteServerHandler(
if (request.getIsOneWay) actorRef.!(message)(sender)
else {
try {
val resultOrNone = actorRef.!!(message)(sender)
val result: AnyRef = if (resultOrNone.isDefined) resultOrNone.get else null
val resultOrNone = narrow[AnyRef](actorRef.!!(message)(sender))
val result = if (resultOrNone.isDefined) resultOrNone.get else null
log.debug("Returning result from actor invocation [%s]", result)
val replyBuilder = RemoteReplyProtocol.newBuilder
.setId(request.getId)