From 7da61b6cc1d8c764318cc87b43637ee1714e1da1 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Tue, 13 Dec 2011 18:29:51 +0100
Subject: [PATCH] rename /null to /deadLetters, fixes #1492

---
 .../src/test/scala/akka/actor/ActorLookupSpec.scala         | 6 +++---
 akka-actor/src/main/scala/akka/actor/ActorRef.scala         | 2 +-
 akka-docs/general/addressing.rst                            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala
index af3b0ba65c..e2ec943789 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala
@@ -84,7 +84,7 @@ class ActorLookupSpec extends AkkaSpec with DefaultTimeout {
 
     "find system-generated actors" in {
       system.actorFor("/user") must be === user
-      system.actorFor("/null") must be === system.deadLetters
+      system.actorFor("/deadLetters") must be === system.deadLetters
       system.actorFor("/system") must be === syst
       system.actorFor(syst.path) must be === syst
       system.actorFor(syst.path.toString) must be === syst
@@ -93,10 +93,10 @@ class ActorLookupSpec extends AkkaSpec with DefaultTimeout {
       system.actorFor(root.path) must be === root
       system.actorFor(root.path.toString) must be === root
       system.actorFor("user") must be === user
-      system.actorFor("null") must be === system.deadLetters
+      system.actorFor("deadLetters") must be === system.deadLetters
       system.actorFor("system") must be === syst
       system.actorFor("user/") must be === user
-      system.actorFor("null/") must be === system.deadLetters
+      system.actorFor("deadLetters/") must be === system.deadLetters
       system.actorFor("system/") must be === syst
     }
 
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index d705fb1b52..3fc3574e75 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -410,7 +410,7 @@ class DeadLetterActorRef(val eventStream: EventStream) extends MinimalActorRef {
   }
 
   private[akka] def init(dispatcher: MessageDispatcher, rootPath: ActorPath) {
-    _path = rootPath / "null"
+    _path = rootPath / "deadLetters"
     brokenPromise = new KeptPromise[Any](Left(new ActorKilledException("In DeadLetterActorRef - promises are always broken.")))(dispatcher)
   }
 
diff --git a/akka-docs/general/addressing.rst b/akka-docs/general/addressing.rst
index 5b62109267..ce59b02e50 100644
--- a/akka-docs/general/addressing.rst
+++ b/akka-docs/general/addressing.rst
@@ -255,7 +255,7 @@ other actors are found. The next level consists of the following:
 - ``"/system"`` is the guardian actor for all system-created top-level actors, 
   e.g. logging listeners or actors automatically deployed by configuration at 
   the start of the actor system.
-- ``"/null"`` is the dead letter actor, which is where all messages sent to 
+- ``"/deadLetters"`` is the dead letter actor, which is where all messages sent to 
   stopped or non-existing actors are re-routed.
 - ``"/temp"`` is the guardian for all short-lived system-created actors, e.g.  
   those which are used in the implementation of :meth:`ActorRef.ask`.