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

commit in the middle of address refactoring

Browse source
This commit is contained in:
Jonas Bonér 2011-04-08 15:29:14 +02:00
parent 654fc3166e
commit 5f918e55bc
30 changed files with 588 additions and 798 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -157,11 +157,11 @@ object ActorSerialization {
}
private def fromBinaryToLocalActorRef[T <: Actor](
bytes: Array[Byte],
homeAddress: Option[InetSocketAddress],
bytes: Array[Byte],
homeAddress: Option[InetSocketAddress],
format: Format[T]): ActorRef = {
val builder = SerializedActorRefProtocol.newBuilder.mergeFrom(bytes)
homeAddress.foreach { addr =>
homeAddress.foreach { addr =>
val addressProtocol = AddressProtocol.newBuilder.setHostname(addr.getAddress.getHostAddress).setPort(addr.getPort).build
builder.setOriginalAddress(addressProtocol)
}
@ -219,7 +219,8 @@ object ActorSerialization {
supervisor,
hotswap,
factory,
homeAddress)
homeAddress,
"address") // FIXME grab real address and use that
val messages = protocol.getMessagesList.toArray.toList.asInstanceOf[List[RemoteMessageProtocol]]
messages.foreach(message => ar ! MessageSerializer.deserialize(message.getMessage))