From f0e9732b7fb735971d3605480239ce3e65f9c933 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 5 Jan 2011 11:43:49 +0100
Subject: [PATCH] Fixing ticket #603

---
 .../main/scala/akka/remote/netty/NettyRemoteSupport.scala    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
index 98bf270ab5..3bbf349bfc 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -171,7 +171,7 @@ abstract class RemoteClient private[akka] (
     isOneWay: Boolean,
     actorRef: ActorRef,
     typedActorInfo: Option[Tuple2[String, String]],
-    actorType: AkkaActorType): Option[CompletableFuture[T]] = {
+    actorType: AkkaActorType): Option[CompletableFuture[T]] = synchronized { //TODO: find better strategy to prevent race
     send(createRemoteMessageProtocolBuilder(
         Some(actorRef),
         Left(actorRef.uuid),
@@ -811,7 +811,7 @@ class RemoteServerHandler(
   val typedSessionActors = new ChannelLocal[ConcurrentHashMap[String, AnyRef]]()
 
   //Writes the specified message to the specified channel and propagates write errors to listeners
-  private def write(channel: Channel, message: AnyRef): Unit =
+  private def write(channel: Channel, message: AnyRef): Unit = {
     channel.write(message).addListener(
       new ChannelFutureListener {
         def operationComplete(future: ChannelFuture): Unit = {
@@ -826,6 +826,7 @@ class RemoteServerHandler(
           }
         }
       })
+  }
 
   /**
    * ChannelOpen overridden to store open channels for a clean postStop of a node.