diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index 883b6668bf..98d7959a9f 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -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 registerSupervisorAsRemoteActor: Option[Uuid] - override def hashCode: Int = HashCode.hash(HashCode.SEED, uuid) 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) @@ -1068,8 +1059,6 @@ private[akka] case class RemoteActorRef private[akka] ( } } - protected[akka] def registerSupervisorAsRemoteActor: Option[Uuid] = None - // ==== NOT SUPPORTED ==== def actorClass: Class[_ <: Actor] = unsupported def dispatcher_=(md: MessageDispatcher): Unit = unsupported diff --git a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala index c3332bb3f4..a1b663d405 100644 --- a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala +++ b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala @@ -335,7 +335,8 @@ object RemoteActorSerialization { secureCookie.foreach(messageBuilder.setCookie(_)) - actorRef.foreach { ref => + /* TODO invent new supervision strategy + actorRef.foreach { ref => ref.registerSupervisorAsRemoteActor.foreach { id => messageBuilder.setSupervisorUuid( UuidProtocol.newBuilder @@ -343,7 +344,7 @@ object RemoteActorSerialization { .setLow(id.getClockSeqAndNode) .build) } - } + } */ if( senderOption.isDefined) messageBuilder.setSender(toRemoteActorRefProtocol(senderOption.get))