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

Incorporate review feedback, see #2552

Browse source
This commit is contained in:
Patrik Nordwall 2012-09-27 17:07:59 +02:00
parent e22b3ed201
commit 6f727ecd29
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
View file

@ -396,8 +396,14 @@ class LocalActorRefProvider(
var terminationHooks = Set.empty[ActorRef]
def receive = {
case Terminated(a) if terminationHooks.contains(a) ⇒ terminationHooks -= a
case Terminated(a) if terminationHooks.contains(a) ⇒
// a registered, and watched termination hook terminated before
// termination process of guardian has started
terminationHooks -= a
case Terminated(_) ⇒
// time for the guardian to stop, but first notify all the
// termination hooks, they will reply with TerminationHookDone
// and when all are done the guardian is stopped
context.become(terminating)
terminationHooks foreach { _ ! TerminationHook }
stopWhenAllTerminationHooksDone()
@ -415,7 +421,7 @@ class LocalActorRefProvider(
}
def stopWhenAllTerminationHooksDone(remove: ActorRef): Unit = {
terminationHooks -= sender
terminationHooks -= remove
stopWhenAllTerminationHooksDone()
}