From 4ee9efc4e4ba2a3922b94067b266923a6770c2ed Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Sat, 17 Sep 2011 13:37:36 +0200
Subject: [PATCH] unborkin master

---
 .../src/main/scala/akka/dispatch/MessageHandling.scala    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
index f5cf778793..36782d9712 100644
--- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
@@ -75,10 +75,10 @@ abstract class MessageDispatcher extends Serializable {
   final def attach(actor: ActorInstance) {
     guard withGuard {
       register(actor)
-    }
-    val promise = new ActorPromise(Timeout.never)(this)
-    dispatchMessage(new MessageInvocation(actor, Init, promise))
-    promise.get
+      val promise = new ActorPromise(Timeout.never)(this)
+      dispatchMessage(new MessageInvocation(actor, Init, promise))
+      promise
+    }.get
   }
 
   /**