merge master into parental-supervision, fixing up resulting breakage

2011-10-21 15:11:43 +02:00 · 2011-10-21 15:11:43 +02:00 · d55f02e6c1
commit d55f02e6c1
parent 3b698b9470 550ed58bf7
95 changed files with 759 additions and 731 deletions
--- a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
+++ b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
@ -101,7 +101,7 @@ class ActorSerialization(val app: AkkaApplication, remote: RemoteSupport) {

            l map { m ⇒
              remoteActorSerialization.createRemoteMessageProtocolBuilder(
-                Option(m.receiver.self),
+                localRef,
                Left(actorRef.uuid),
                actorRef.address,
                app.AkkaConfig.ActorTimeoutMillis,