From 7d9df1026be6e6f7d267e992b95b7b5ca30fff69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= <jonasremove@jonasboner.com>
Date: Sun, 16 May 2010 11:58:20 +0200
Subject: [PATCH] Fixed final bug in remote protocol, now refactoring should
 (finally) be complete

---
 akka-core/src/main/scala/actor/ActorRef.scala |  3 +-
 .../src/test/scala/RemoteSupervisorSpec.scala | 82 ++++++++++---------
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/akka-core/src/main/scala/actor/ActorRef.scala b/akka-core/src/main/scala/actor/ActorRef.scala
index 5f8a6d93c8..309a2766b0 100644
--- a/akka-core/src/main/scala/actor/ActorRef.scala
+++ b/akka-core/src/main/scala/actor/ActorRef.scala
@@ -1216,8 +1216,7 @@ private[akka] case class RemoteActorRef private[akka] (
   timeout = _timeout
   
   start
-  Thread.sleep(1000)
-  val remoteClient = RemoteClient.clientFor(hostname, port)
+  lazy val remoteClient = RemoteClient.clientFor(hostname, port)
 
   def postMessageToMailbox(message: Any, senderOption: Option[ActorRef]): Unit = {
     val requestBuilder = RemoteRequestProtocol.newBuilder
diff --git a/akka-core/src/test/scala/RemoteSupervisorSpec.scala b/akka-core/src/test/scala/RemoteSupervisorSpec.scala
index 23b82ca187..7be415a4c3 100644
--- a/akka-core/src/test/scala/RemoteSupervisorSpec.scala
+++ b/akka-core/src/test/scala/RemoteSupervisorSpec.scala
@@ -35,6 +35,7 @@ object Log {
   }
 
   override def postRestart(reason: Throwable) {
+    println("================= POST RESTART")
     Log.messageLog.put(reason.getMessage)
   }
 }
@@ -50,6 +51,7 @@ object Log {
   }
 
   override def postRestart(reason: Throwable) {
+    println("================= POST RESTART")
     Log.messageLog.put(reason.getMessage)
   }
 }
@@ -65,6 +67,7 @@ object Log {
   }
 
   override def postRestart(reason: Throwable) {
+    println("================= POST RESTART")
     Log.messageLog.put(reason.getMessage)
   }
 }
@@ -105,7 +108,7 @@ class RemoteSupervisorSpec extends JUnitSuite {
       pingpong1 !! BinaryString("Die")
     }
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
   }
 
@@ -118,21 +121,21 @@ class RemoteSupervisorSpec extends JUnitSuite {
     }
 
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     intercept[RuntimeException] {
       pingpong1 !! BinaryString("Die")
     }
 
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("pong") {
       (pingpong1 !! BinaryString("Ping")).getOrElse("nil")
     }
 
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
   }
 
@@ -145,7 +148,7 @@ class RemoteSupervisorSpec extends JUnitSuite {
     }
 
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
   }
 
@@ -153,26 +156,29 @@ class RemoteSupervisorSpec extends JUnitSuite {
     Log.messageLog.clear
     val sup = getSingleActorAllForOneSupervisor
     sup.start
+
     expect("pong") {
       (pingpong1 !! BinaryString("Ping")).getOrElse("nil")
     }
 
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
+
     intercept[RuntimeException] {
       pingpong1 !! BinaryString("Die")
     }
 
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
+
     expect("pong") {
       (pingpong1 !! BinaryString("Ping")).getOrElse("nil")
     }
 
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
   }
 
@@ -181,11 +187,11 @@ class RemoteSupervisorSpec extends JUnitSuite {
     val sup = getMultipleActorsOneForOneConf
     sup.start
     intercept[RuntimeException] {
-      pingpong3 !! BinaryString("Die")
+      pingpong1 !! BinaryString("Die")
     }
 
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
   }
 
@@ -206,20 +212,20 @@ class RemoteSupervisorSpec extends JUnitSuite {
     }
 
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     intercept[RuntimeException] {
       pingpong2 !! BinaryString("Die")
     }
 
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("pong") {
       (pingpong1 !! BinaryString("Ping")).getOrElse("nil")
@@ -234,13 +240,13 @@ class RemoteSupervisorSpec extends JUnitSuite {
     }
 
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
   }
 
@@ -253,13 +259,13 @@ class RemoteSupervisorSpec extends JUnitSuite {
     }
 
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
   }
 
@@ -280,26 +286,26 @@ class RemoteSupervisorSpec extends JUnitSuite {
     }
 
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     intercept[RuntimeException] {
       pingpong2 !! BinaryString("Die")
     }
 
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("DIE") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("pong") {
       (pingpong1 !! BinaryString("Ping")).getOrElse("nil")
@@ -314,13 +320,13 @@ class RemoteSupervisorSpec extends JUnitSuite {
     }
 
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
     expect("ping") {
-      Log.messageLog.poll(1, TimeUnit.SECONDS)
+      Log.messageLog.poll(5, TimeUnit.SECONDS)
     }
   }
 
@@ -411,15 +417,15 @@ class RemoteSupervisorSpec extends JUnitSuite {
         Supervise(
           pingpong1,
           LifeCycle(Permanent))
-            ::
-            Supervise(
-              pingpong2,
-              LifeCycle(Permanent))
-            ::
-            Supervise(
-              pingpong3,
-              LifeCycle(Permanent))
-            :: Nil))
+          ::
+        Supervise(
+          pingpong2,
+          LifeCycle(Permanent))
+          ::
+        Supervise(
+          pingpong3,
+          LifeCycle(Permanent))
+          :: Nil))
     factory.newInstance
   }