raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge master into tame-globals branch

Browse source
This commit is contained in:
Peter Vlugter 2011-10-13 13:41:44 +02:00
commit 317b8bc03b
60 changed files with 2079 additions and 1696 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
View file

@ -243,7 +243,7 @@ class RemoteActorSerialization(val app: AkkaApplication) {
EventHandler.debug(this, "Deserializing RemoteActorRefProtocol to RemoteActorRef:\n %s".format(protocol))
val ref = RemoteActorRef(
app, app.remote,
app.remote,
JavaSerializer.fromBinary(protocol.getInetSocketAddress.toByteArray, Some(classOf[InetSocketAddress]), loader).asInstanceOf[InetSocketAddress],
protocol.getAddress,
loader)