From 22a7a0626a2ce76cd74b6fee332177b4ea701536 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Wed, 6 Nov 2013 14:29:36 +0100
Subject: [PATCH] =act #3507 Change format of ActorSelection.toString

---
 .../test/scala/akka/actor/ActorSelectionSpec.scala    |  3 ++-
 .../src/main/scala/akka/actor/ActorSelection.scala    | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala
index 87c9f9057f..f7c4e62c58 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala
@@ -325,7 +325,8 @@ class ActorSelectionSpec extends AkkaSpec("akka.loglevel=DEBUG") with DefaultTim
     }
 
     "print nicely" in {
-      ActorSelection(c21, "../*/hello").toString must be(s"ActorSelection[Actor[akka://ActorSelectionSpec/user/c2/c21#${c21.path.uid}]/../*/hello]")
+      ActorSelection(c21, "../*/hello").toString must be(
+        s"ActorSelection[Anchor(akka://ActorSelectionSpec/user/c2/c21#${c21.path.uid}), Path(/../*/hello)]")
     }
 
   }
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala b/akka-actor/src/main/scala/akka/actor/ActorSelection.scala
index 7b2b542dd8..51ec301da2 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSelection.scala
@@ -70,10 +70,13 @@ abstract class ActorSelection extends Serializable {
   def resolveOne(timeout: FiniteDuration): Future[ActorRef] = resolveOne()(timeout)
 
   override def toString: String = {
-    (new java.lang.StringBuilder).append("ActorSelection[").
-      append(anchor.toString).
-      append(path.mkString("/", "/", "")).
-      append("]").toString
+    val builder = new java.lang.StringBuilder()
+    builder.append("ActorSelection[Anchor(").append(anchor.path)
+    if (anchor.path.uid != ActorCell.undefinedUid)
+      builder.append("#").append(anchor.path.uid)
+
+    builder.append("), Path(").append(path.mkString("/", "/", "")).append(")]")
+    builder.toString
   }
 
   override def equals(obj: Any): Boolean = obj match {