fixed merge

2010-09-20 12:41:40 +02:00 · 2010-09-20 12:41:40 +02:00 · 8a6c524861
commit 8a6c524861
parent 28eb6d1853
1 changed files with 1 additions and 1 deletions
--- 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