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

Removed client-managed actors, a lot of deprecated methods and DataFlowVariable (superceded by Future)

Browse source
This commit is contained in:
Viktor Klang 2011-04-07 12:48:30 +02:00
parent 46460a9616
commit 0dff50fa52
24 changed files with 53 additions and 1113 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ trait Format[T <: Actor] extends FromBinary[T] with ToBinary[T]
* }
* </pre>
*/
@serializable trait StatelessActorFormat[T <: Actor] extends Format[T] {
trait StatelessActorFormat[T <: Actor] extends Format[T] with scala.Serializable{
def fromBinary(bytes: Array[Byte], act: T) = act
def toBinary(ac: T) = Array.empty[Byte]
@ -64,7 +64,7 @@ trait Format[T <: Actor] extends FromBinary[T] with ToBinary[T]
* }
* </pre>
*/
@serializable trait SerializerBasedActorFormat[T <: Actor] extends Format[T] {
trait SerializerBasedActorFormat[T <: Actor] extends Format[T] with scala.Serializable {
val serializer: Serializer
def fromBinary(bytes: Array[Byte], act: T) = serializer.fromBinary(bytes, Some(act.self.actorClass)).asInstanceOf[T]
@ -205,10 +205,11 @@ object ActorSerialization {
else actorClass.newInstance.asInstanceOf[Actor]
}
/* TODO Can we remove originalAddress from the protocol?
val homeAddress = {
val address = protocol.getOriginalAddress
Some(new InetSocketAddress(address.getHostname, address.getPort))
}
}*/
val ar = new LocalActorRef(
uuidFrom(protocol.getUuid.getHigh, protocol.getUuid.getLow),
@ -218,8 +219,7 @@ object ActorSerialization {
lifeCycle,
supervisor,
hotswap,
factory,
homeAddress)
factory)
val messages = protocol.getMessagesList.toArray.toList.asInstanceOf[List[RemoteMessageProtocol]]
messages.foreach(message => ar ! MessageSerializer.deserialize(message.getMessage))