From 8a6c524861eabb5664216f7bb1110d84fa33088c Mon Sep 17 00:00:00 2001
From: Michael Kober <michael.kober@jayway.com>
Date: Mon, 20 Sep 2010 12:41:40 +0200
Subject: [PATCH] fixed merge

---
 akka-remote/src/main/scala/remote/RemoteServer.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-remote/src/main/scala/remote/RemoteServer.scala b/akka-remote/src/main/scala/remote/RemoteServer.scala
index 3763bcb17b..0c8b305364 100644
--- a/akka-remote/src/main/scala/remote/RemoteServer.scala
+++ b/akka-remote/src/main/scala/remote/RemoteServer.scala
@@ -354,8 +354,8 @@ class RemoteServer extends Logging with ListenerManagement {
       if (id.startsWith(UUID_PREFIX)) {
         actorsByUuid().remove(id.substring(UUID_PREFIX.length)) 
       } else {
+        val actorRef = actors().get(id)
         if (actorRef.registeredInRemoteNodeDuringSerialization) {
-          val actorRef = actors().get(id)
           actorsByUuid() remove actorRef.uuid
         }
         actors() remove id