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

Perform Terminate removeChild under the terminating lock also, see #2552

Browse source
This commit is contained in:
Patrik Nordwall 2012-09-27 14:28:40 +02:00
parent 2b5eb67991
commit 2e343eca24
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
View file

@ -82,15 +82,17 @@ private[akka] class RemoteSystemDaemon(system: ActorSystemImpl, _path: ActorPath
} }
case Terminated(child: ActorRefWithCell) if child.asInstanceOf[ActorRefScope].isLocal ⇒ case Terminated(child: ActorRefWithCell) if child.asInstanceOf[ActorRefScope].isLocal ⇒
removeChild(child.path.elements.drop(1).mkString("/")) terminating.locked {
terminationHookDoneWhenNoChildren() removeChild(child.path.elements.drop(1).mkString("/"))
terminationHookDoneWhenNoChildren()
}
case t: Terminated ⇒ case t: Terminated ⇒
case TerminationHook ⇒ case TerminationHook ⇒
terminating.switchOn { terminating.switchOn {
terminationHookDoneWhenNoChildren() terminationHookDoneWhenNoChildren()
foreachChild { system.stop(_) } foreachChild { system.stop }
} }
case AddressTerminated(address) ⇒ case AddressTerminated(address) ⇒
@ -99,7 +101,8 @@ private[akka] class RemoteSystemDaemon(system: ActorSystemImpl, _path: ActorPath
case unknown ⇒ log.warning("Unknown message {} received by {}", unknown, this) case unknown ⇒ log.warning("Unknown message {} received by {}", unknown, this)
} }
def terminationHookDoneWhenNoChildren(): Unit = if (terminating.isOn && !hasChildren) def terminationHookDoneWhenNoChildren(): Unit = terminating.whileOn {
system.provider.systemGuardian.tell(TerminationHookDone, this) if (!hasChildren) system.provider.systemGuardian.tell(TerminationHookDone, this)
}
} }