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

Removing registerSupervisorAsRemoteActor from ActorRef + SerializationProtocol

Browse source
This commit is contained in:
Viktor Klang 2011-04-07 13:50:34 +02:00
parent 87069f6e02
commit 05ba449919
2 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
akka-actor/src/main/scala/akka/actor/ActorRef.scala
View file

@ -530,8 +530,6 @@ trait ActorRef extends ActorRefShared with java.lang.Comparable[ActorRef] { scal
protected[akka] def restartLinkedActors(reason: Throwable, maxNrOfRetries: Option[Int], withinTimeRange: Option[Int]): Unit protected[akka] def restartLinkedActors(reason: Throwable, maxNrOfRetries: Option[Int], withinTimeRange: Option[Int]): Unit
protected[akka] def registerSupervisorAsRemoteActor: Option[Uuid]
override def hashCode: Int = HashCode.hash(HashCode.SEED, uuid) override def hashCode: Int = HashCode.hash(HashCode.SEED, uuid)
override def equals(that: Any): Boolean = { override def equals(that: Any): Boolean = {
@ -903,13 +901,6 @@ class LocalActorRef private[akka] (private[this] val actorFactory: () => Actor)
} }
} }
} }
//TODO KEEP THIS?
protected[akka] def registerSupervisorAsRemoteActor: Option[Uuid] = guard.withGuard {
ensureRemotingEnabled
if (_supervisor.isDefined) {
Some(_supervisor.get.uuid)
} else None
}
def linkedActors: JMap[Uuid, ActorRef] = java.util.Collections.unmodifiableMap(_linkedActors) def linkedActors: JMap[Uuid, ActorRef] = java.util.Collections.unmodifiableMap(_linkedActors)
@ -1068,8 +1059,6 @@ private[akka] case class RemoteActorRef private[akka] (
} }
} }
protected[akka] def registerSupervisorAsRemoteActor: Option[Uuid] = None
// ==== NOT SUPPORTED ==== // ==== NOT SUPPORTED ====
def actorClass: Class[_ <: Actor] = unsupported def actorClass: Class[_ <: Actor] = unsupported
def dispatcher_=(md: MessageDispatcher): Unit = unsupported def dispatcher_=(md: MessageDispatcher): Unit = unsupported

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

@ -335,7 +335,8 @@ object RemoteActorSerialization {
secureCookie.foreach(messageBuilder.setCookie(_)) secureCookie.foreach(messageBuilder.setCookie(_))
actorRef.foreach { ref => /* TODO invent new supervision strategy
actorRef.foreach { ref =>
ref.registerSupervisorAsRemoteActor.foreach { id => ref.registerSupervisorAsRemoteActor.foreach { id =>
messageBuilder.setSupervisorUuid( messageBuilder.setSupervisorUuid(
UuidProtocol.newBuilder UuidProtocol.newBuilder
@ -343,7 +344,7 @@ object RemoteActorSerialization {
.setLow(id.getClockSeqAndNode) .setLow(id.getClockSeqAndNode)
.build) .build)
} }
} } */
if( senderOption.isDefined) if( senderOption.isDefined)
messageBuilder.setSender(toRemoteActorRefProtocol(senderOption.get)) messageBuilder.setSender(toRemoteActorRefProtocol(senderOption.get))