From 869549c590ce91686ad19caf5ea2336bd51388b2 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Tue, 7 Sep 2010 11:02:12 +0200
Subject: [PATCH] Fixing id/uuid misfortune

---
 .../src/main/scala/remote/RemoteServer.scala     | 16 ++++++----------
 .../remote/ClientInitiatedRemoteActorSpec.scala  |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/akka-remote/src/main/scala/remote/RemoteServer.scala b/akka-remote/src/main/scala/remote/RemoteServer.scala
index 142670a84a..6337bd9893 100644
--- a/akka-remote/src/main/scala/remote/RemoteServer.scala
+++ b/akka-remote/src/main/scala/remote/RemoteServer.scala
@@ -274,9 +274,9 @@ class RemoteServer extends Logging with ListenerManagement {
   // TODO: register typed actor in RemoteServer as well
 
   /**
-   * Register Remote Actor by the Actor's 'uuid' field. It starts the Actor if it is not started already.
+   * Register Remote Actor by the Actor's 'id' field. It starts the Actor if it is not started already.
    */
-  def register(actorRef: ActorRef): Unit = register(actorRef.uuid,actorRef)
+  def register(actorRef: ActorRef): Unit = register(actorRef.id,actorRef)
 
   /**
    * Register Remote Actor by a specific 'id' passed as argument.
@@ -295,13 +295,13 @@ class RemoteServer extends Logging with ListenerManagement {
   }
 
   /**
-   * Unregister Remote Actor that is registered using its 'uuid' field (not custom ID).
+   * Unregister Remote Actor that is registered using its 'id' field (not custom ID).
    */
   def unregister(actorRef: ActorRef):Unit = synchronized {
     if (_isRunning) {
       log.debug("Unregistering server side remote actor [%s] with id [%s:%s]", actorRef.actorClass.getName, actorRef.id, actorRef.uuid)
       val actorMap = actors()
-      actorMap remove actorRef.uuid
+      actorMap remove actorRef.id
       if (actorRef.registeredInRemoteNodeDuringSerialization) actorMap remove actorRef.uuid
     }
   }
@@ -325,12 +325,8 @@ class RemoteServer extends Logging with ListenerManagement {
 
   protected[akka] override def foreachListener(f: (ActorRef) => Unit): Unit = super.foreachListener(f)
 
-  private[akka] def actors() : ConcurrentHashMap[String, ActorRef] = {
-    RemoteServer.actorsFor(address).actors
-  }
-  private[akka] def typedActors() : ConcurrentHashMap[String, AnyRef] = {
-    RemoteServer.actorsFor(address).typedActors
-  }
+  private[akka] def actors() = RemoteServer.actorsFor(address).actors
+  private[akka] def typedActors() = RemoteServer.actorsFor(address).typedActors
 }
 
 object RemoteServerSslContext {
diff --git a/akka-remote/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala b/akka-remote/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala
index 7ff46ab910..e03259e573 100644
--- a/akka-remote/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala
+++ b/akka-remote/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala
@@ -103,7 +103,7 @@ class ClientInitiatedRemoteActorSpec extends JUnitSuite {
     sender.actor.asInstanceOf[SendOneWayAndReplySenderActor].sendTo = actor
     sender.start
     sender.actor.asInstanceOf[SendOneWayAndReplySenderActor].sendOff
-    assert(SendOneWayAndReplySenderActor.latch.await(1, TimeUnit.SECONDS))
+    assert(SendOneWayAndReplySenderActor.latch.await(3, TimeUnit.SECONDS))
     assert(sender.actor.asInstanceOf[SendOneWayAndReplySenderActor].state.isDefined === true)
     assert("World" === sender.actor.asInstanceOf[SendOneWayAndReplySenderActor].state.get.asInstanceOf[String])
     actor.stop