From 93b2ef55fc516d2e75da1a01e5193c18f09e7381 Mon Sep 17 00:00:00 2001
From: Derek Williams <derek@nebvin.ca>
Date: Mon, 14 Feb 2011 21:41:31 -0700
Subject: [PATCH] Small change to better take advantage of latest Future
 changes

---
 akka-actor/src/main/scala/akka/actor/ActorRef.scala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index d1092a7d0a..3e6342bf36 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -1323,8 +1323,7 @@ trait ScalaActorRef extends ActorRefShared { ref: ActorRef =>
           if (isMessageJoinPoint) throw e
           else None
       }
-      if (future.exception.isDefined) throw future.exception.get
-      else future.result
+      future.resultOrException
     } else throw new ActorInitializationException(
       "Actor has not been started, you need to invoke 'actor.start' before using it")
   }