From 47509668b1136ca53bab4291ef4e1e5aeee2703d Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 23 Jul 2012 16:23:26 +0200 Subject: [PATCH] Fixing bug in preRestart pushing the envelope as message --- akka-actor/src/main/scala/akka/actor/cell/FaultHandling.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-actor/src/main/scala/akka/actor/cell/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/cell/FaultHandling.scala index 32786b7bb7..862537cd10 100644 --- a/akka-actor/src/main/scala/akka/actor/cell/FaultHandling.scala +++ b/akka-actor/src/main/scala/akka/actor/cell/FaultHandling.scala @@ -51,10 +51,10 @@ private[akka] trait FaultHandling { this: ActorCell ⇒ if (failedActor ne null) { try { // if the actor fails in preRestart, we can do nothing but log it: it’s best-effort - if (failedActor.context ne null) failedActor.preRestart(cause, Option(currentMessage)) + if (failedActor.context ne null) failedActor.preRestart(cause, Option(currentMessage.message)) } catch { case NonFatal(e) ⇒ - val ex = new PreRestartException(self, e, cause, Option(currentMessage)) + val ex = new PreRestartException(self, e, cause, Option(currentMessage.message)) publish(Error(ex, self.path.toString, clazz(failedActor), e.getMessage)) } finally { clearActorFields(failedActor)