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

Merge with master + update RemoteProtocol.proto

Browse source
This commit is contained in:
Viktor Klang 2010-09-17 11:32:03 +02:00
commit 12aedd9fbe
171 changed files with 5516 additions and 8745 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,17 +2,18 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.serialization
import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
import se.scalablesolutions.akka.config.ScalaConfig._
import se.scalablesolutions.akka.actor.{Actor, ActorRef, LocalActorRef, RemoteActorRef, IllegalActorStateException, ActorType}
import se.scalablesolutions.akka.stm.global._
import se.scalablesolutions.akka.stm.TransactionManagement._
import se.scalablesolutions.akka.stm.TransactionManagement
import se.scalablesolutions.akka.remote.protocol.RemoteProtocol._
import se.scalablesolutions.akka.remote.{RemoteServer, MessageSerializer}
import se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorType._
import se.scalablesolutions.akka.serialization.Serializer
import se.scalablesolutions.akka.remote.protocol.RemoteProtocol.{ActorType => ActorTypeProtocol, _}
import ActorTypeProtocol._
import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
import se.scalablesolutions.akka.config.ScalaConfig._
import com.google.protobuf.ByteString
import se.scalablesolutions.akka.util.UUID
@ -68,7 +69,7 @@ trait SerializerBasedActorFormat[T <: Actor] extends Format[T] {
}
/**
* Module for local actor serialization
* Module for local actor serialization.
*/
object ActorSerialization {
@ -250,6 +251,7 @@ object RemoteActorSerialization {
val actorInfoBuilder = ActorInfoProtocol.newBuilder
.setUuid(uuid)
.setId(actorRef.id)
.setTarget(actorClassName)
.setTimeout(timeout)