From 5530c4cbdb34d439a6851bdf5000275159a680d0 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 5 Dec 2011 14:01:03 +0100 Subject: [PATCH 1/2] Unborking master --- akka-actor/src/main/scala/akka/actor/Actor.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala index d39b0a2270..0770448c3b 100644 --- a/akka-actor/src/main/scala/akka/actor/Actor.scala +++ b/akka-actor/src/main/scala/akka/actor/Actor.scala @@ -200,7 +200,7 @@ trait Actor { "\n\tYou cannot create an instance of " + getClass.getName + " explicitly using the constructor (new)." + "\n\tYou have to use one of the factory methods to create a new actor. Either use:" + "\n\t\t'val actor = context.actorOf[MyActor]' (to create a supervised child actor from within an actor), or" + - "\n\t\t'val actor = system.actorOf(new MyActor(..))' (to create a top level actor from the ActorSystem), or") + "\n\t\t'val actor = system.actorOf(new MyActor(..))' (to create a top level actor from the ActorSystem), or" + "\n\t\t'val actor = context.actorOf[MyActor]' (to create a supervised child actor from within an actor), or" + "\n\t\t'val actor = system.actorOf(new MyActor(..))' (to create a top level actor from the ActorSystem)") From 96182885c2eba389837c7871b9dcd9e68a7141f6 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 6 Dec 2011 11:28:29 +0100 Subject: [PATCH 2/2] #1437 - Replacing self with the DeadLetterActorRef when the ActorCell is shut down, this to direct captured self references to the DLQ --- 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 c7a37de589..6311ef0993 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala @@ -417,7 +417,7 @@ private[akka] class ActorCell( } } - final def clearActorFields(): Unit = setActorFields(context = null, self = null) + final def clearActorFields(): Unit = setActorFields(context = null, self = system.deadLetters) final def setActorFields(context: ActorContext, self: ActorRef) { @tailrec