From 5321d02f64a6d326c54afc5f1f93e3554630b647 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 3 Oct 2011 20:47:56 +0200 Subject: [PATCH] Removing actorClass from ActorRef signature, makes no sense from the perspective of distribution, and with async start it is racy --- akka-actor/src/main/scala/akka/actor/ActorCell.scala | 3 --- akka-actor/src/main/scala/akka/actor/ActorRef.scala | 2 -- .../main/scala/akka/serialization/SerializationProtocol.scala | 3 --- 3 files changed, 8 deletions(-) diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala index 0cf42079b1..83d586b6af 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala @@ -227,9 +227,6 @@ private[akka] class ActorCell( def uuid: Uuid = self.uuid - //FIXME TODO REMOVE THIS - def actorClass: Class[_] = actor.getClass - def dispatcher: MessageDispatcher = props.dispatcher def isShutdown: Boolean = mailbox.isClosed diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index 74633b9a20..3622500f8d 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -237,8 +237,6 @@ class LocalActorRef private[akka] ( // ========= AKKA PROTECTED FUNCTIONS ========= - protected[akka] def actorClass: Class[_] = actorCell.actorClass - protected[akka] def underlying: ActorCell = actorCell // FIXME TODO: remove this method diff --git a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala index 8e428e4552..3e6ea8f2fb 100644 --- a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala +++ b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala @@ -69,9 +69,6 @@ object ActorSerialization { .setAddress(actorRef.address) .setTimeout(actorRef.timeout) - if (localRef.isDefined) - builder.setActorClassname(localRef.get.actorClass.getName) //TODO FIXME Why is the classname needed anymore? - replicationScheme match { case _: Transient | Transient ⇒ builder.setReplicationStorage(ReplicationStorageType.TRANSIENT)