From c37c4e4655e7ee5aa78ba944a2d0398fd768da10 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 17 Jan 2011 11:44:07 +0100 Subject: [PATCH] Switching to Peters cleaner solution --- akka-actor/src/main/scala/akka/actor/ActorRef.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index bb617ab6da..6c8a92f325 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -1341,10 +1341,10 @@ trait ScalaActorRef extends ActorRefShared { ref: ActorRef => */ def forward(message: Any)(implicit sender: Some[ActorRef]) = { if (isRunning) { - if (sender.get.senderFuture.isDefined) postMessageToMailboxAndCreateFutureResultWithTimeout( - message, timeout, sender.get.sender, sender.get.senderFuture) - else if (sender.get.sender.isDefined) postMessageToMailbox(message, sender.get.sender) - else postMessageToMailbox(message, None) + if (sender.get.senderFuture.isDefined) + postMessageToMailboxAndCreateFutureResultWithTimeout(message, timeout, sender.get.sender, sender.get.senderFuture) + else + postMessageToMailbox(message, sender.get.sender) } else throw new ActorInitializationException("Actor has not been started, you need to invoke 'actor.start' before using it") }