Merge pull request #708 from stefansedich/dev

Change ordering within ActorSelection to fix issue where /foo paths were...
akkadotnet · Mar 3, 2015 · 92e7844 · 92e7844 · Petabridge-CI · Mar 3, 2015
2 parents b319b3c + 0e1c2cd
commit 92e7844
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/core/Akka/Actor/ActorRefFactoryShared.cs b/src/core/Akka/Actor/ActorRefFactoryShared.cs
@@ -35,28 +35,30 @@ public static ActorSelection ActorSelection(ActorPath actorPath, ActorSystem sys
         public static ActorSelection ActorSelection(string path, ActorSystem system, ActorRef lookupRoot)
         {
             var provider = ((ActorSystemImpl)system).Provider;
-            if(Uri.IsWellFormedUriString(path, UriKind.Absolute))
-            {
-                ActorPath actorPath;
-                if(!ActorPath.TryParse(path, out actorPath))
-                    return new ActorSelection(provider.DeadLetters, "");
 
-                var actorRef = provider.RootGuardianAt(actorPath.Address);
-                return new ActorSelection(actorRef, actorPath.Elements);
-            }
             //no path given
-            if(string.IsNullOrEmpty(path))
+            if (string.IsNullOrEmpty(path))
             {
                 return new ActorSelection(system.DeadLetters, "");
             }
 
             //absolute path
             var elements = path.Split('/');
-            if(elements[0] == "")
+            if (elements[0] == "")
             {
                 return new ActorSelection(provider.RootGuardian, elements.Skip(1));
             }
 
+            if(Uri.IsWellFormedUriString(path, UriKind.Absolute))
+            {
+                ActorPath actorPath;
+                if(!ActorPath.TryParse(path, out actorPath))
+                    return new ActorSelection(provider.DeadLetters, "");
+
+                var actorRef = provider.RootGuardianAt(actorPath.Address);
+                return new ActorSelection(actorRef, actorPath.Elements);
+            }
+
             return new ActorSelection(lookupRoot, path);
         }
     }