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

Restructuring the ordering of recreating actor instances so it's more safe if the constructor fails on recreate

Browse source
This commit is contained in:
Viktor Klang 2011-09-29 17:20:21 +02:00
parent 950b11850a
commit 4c06b559bc
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
akka-actor/src/main/scala/akka/actor/ActorCell.scala
View file

@ -331,20 +331,21 @@ private[akka] class ActorCell(
case failedActor if recreation ⇒
val reason = new Exception("CRASHED") //FIXME TODO stash away the exception that caused the failure and reuse that? <------- !!!!!!!!!! RED RED RED
try {
if (Actor.debugLifecycle) EventHandler.debug(failedActor, "restarting")
val freshActor = newActor()
clearActorContext()
if (failedActor ne null) {
val c = currentMessage //One read only plz
if (Actor.debugLifecycle) EventHandler.debug(failedActor, "restarting")
val freshActor = newActor()
if (failedActor ne null) {
val c = currentMessage //One read only plz
try {
failedActor.preRestart(reason, if (c ne null) Some(c.message) else None)
} finally {
clearActorContext()
currentMessage = null
actor = null
}
actor = freshActor // assign it here so if preStart fails, we can null out the sef-refs next call
freshActor.postRestart(reason)
if (Actor.debugLifecycle) EventHandler.debug(freshActor, "restarted")
} finally {
currentMessage = null
}
actor = freshActor // assign it here so if preStart fails, we can null out the sef-refs next call
freshActor.postRestart(reason)
if (Actor.debugLifecycle) EventHandler.debug(freshActor, "restarted")
dispatcher.resume(this) //FIXME should this be moved down?