diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala index 8b3bc7c8c2..8e904dc297 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala @@ -5,7 +5,6 @@ package akka.actor import akka.testkit.AkkaSpec -import akka.util.duration._ import DeploymentConfig._ import akka.remote.RemoteAddress import com.typesafe.config.ConfigFactory diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala index c2fa150538..9e68e9b7bb 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala @@ -530,7 +530,9 @@ class LocalActorRefProvider( private def adaptFromDeploy(r: RouterConfig, p: ActorPath): RouterConfig = { val lookupPath = p.elements.mkString("/", "/", "") + println("**** LOOKUP PATH : " + lookupPath) val deploy = deployer.instance.lookupDeployment(lookupPath) + println("**** " + deploy) r.adaptFromDeploy(deploy) } diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala index c7ce67cead..0fe276c40b 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala @@ -85,6 +85,9 @@ class RemoteActorRefProvider( if (systemService) local.actorOf(system, props, supervisor, name, systemService) else { val path = supervisor.path / name + + println("*** PATH : " + path.toString) + val newFuture = Promise[ActorRef](system.settings.ActorTimeout)(dispatcher) actors.putIfAbsent(path.toString, newFuture) match { // we won the race -- create the actor and resolve the future diff --git a/akka-tutorials/akka-tutorial-first/src/main/resources/akka.conf b/akka-tutorials/akka-tutorial-first/src/main/resources/akka.conf index 13b0c06eb1..17517bccbe 100644 --- a/akka-tutorials/akka-tutorial-first/src/main/resources/akka.conf +++ b/akka-tutorials/akka-tutorial-first/src/main/resources/akka.conf @@ -1,6 +1,6 @@ akka.actor.deployment { - /user/pi2 { + /user/master/pi { router = round-robin - nr-of-instances = 4 + nr-of-instances = 10 } -} \ No newline at end of file +} diff --git a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala index 233c6ae26d..49a3a2ca14 100644 --- a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala +++ b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala @@ -107,7 +107,7 @@ object Pi extends App { // ===== Run it ===== // ================== def calculate(nrOfWorkers: Int, nrOfElements: Int, nrOfMessages: Int) { - val system = ActorSystem("x", ConfigFactory.parseString("akka.actor.debug.lifecycle=true\nakka.loglevel=DEBUG")) + val system = ActorSystem() // this latch is only plumbing to know when the calculation is completed val latch = new CountDownLatch(1)