From c316cd4e0b47f35b9d4e16ca9122980b834b59ff Mon Sep 17 00:00:00 2001 From: Roland Date: Mon, 13 Feb 2012 22:53:38 +0100 Subject: [PATCH] =?UTF-8?q?don=E2=80=99t=20mask=20origin=20NPE=20when=20in?= =?UTF-8?q?voking=20actor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- akka-actor/src/main/scala/akka/actor/ActorCell.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala index cfcce7ab2c..a5331e9f49 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala @@ -495,7 +495,7 @@ private[akka] class ActorCell( dispatcher.reportFailure(new LogEventException(Error(e, self.path.toString, clazz(actor), e.getMessage), e)) // prevent any further messages to be processed until the actor has been restarted dispatcher.suspend(this) - actor.supervisorStrategy.handleSupervisorFailing(self, children) + if (actor ne null) actor.supervisorStrategy.handleSupervisorFailing(self, children) parent.tell(Failed(e), self) } finally { checkReceiveTimeout // Reschedule receive timeout