raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

fixed merge

Browse source
This commit is contained in:
Michael Kober 2010-09-20 12:41:40 +02:00
parent 28eb6d1853
commit 8a6c524861
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-remote/src/main/scala/remote/RemoteServer.scala
View file

@ -354,8 +354,8 @@ class RemoteServer extends Logging with ListenerManagement {
if (id.startsWith(UUID_PREFIX)) { if (id.startsWith(UUID_PREFIX)) {
actorsByUuid().remove(id.substring(UUID_PREFIX.length)) actorsByUuid().remove(id.substring(UUID_PREFIX.length))
} else { } else {
if (actorRef.registeredInRemoteNodeDuringSerialization) {
val actorRef = actors().get(id) val actorRef = actors().get(id)
if (actorRef.registeredInRemoteNodeDuringSerialization) {
actorsByUuid() remove actorRef.uuid actorsByUuid() remove actorRef.uuid
} }
actors() remove id actors() remove id