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

Fixing id/uuid misfortune

Browse source
This commit is contained in:
Viktor Klang 2010-09-07 11:02:12 +02:00
parent 63dbdd6c3e
commit 869549c590
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
akka-remote/src/main/scala/remote/RemoteServer.scala
View file

@ -274,9 +274,9 @@ class RemoteServer extends Logging with ListenerManagement {
// TODO: register typed actor in RemoteServer as well
/**
* Register Remote Actor by the Actor's 'uuid' field. It starts the Actor if it is not started already.
* Register Remote Actor by the Actor's 'id' field. It starts the Actor if it is not started already.
*/
def register(actorRef: ActorRef): Unit = register(actorRef.uuid,actorRef)
def register(actorRef: ActorRef): Unit = register(actorRef.id,actorRef)
/**
* Register Remote Actor by a specific 'id' passed as argument.
@ -295,13 +295,13 @@ class RemoteServer extends Logging with ListenerManagement {
}
/**
* Unregister Remote Actor that is registered using its 'uuid' field (not custom ID).
* Unregister Remote Actor that is registered using its 'id' field (not custom ID).
*/
def unregister(actorRef: ActorRef):Unit = synchronized {
if (_isRunning) {
log.debug("Unregistering server side remote actor [%s] with id [%s:%s]", actorRef.actorClass.getName, actorRef.id, actorRef.uuid)
val actorMap = actors()
actorMap remove actorRef.uuid
actorMap remove actorRef.id
if (actorRef.registeredInRemoteNodeDuringSerialization) actorMap remove actorRef.uuid
}
}
@ -325,12 +325,8 @@ class RemoteServer extends Logging with ListenerManagement {
protected[akka] override def foreachListener(f: (ActorRef) => Unit): Unit = super.foreachListener(f)
private[akka] def actors() : ConcurrentHashMap[String, ActorRef] = {
RemoteServer.actorsFor(address).actors
}
private[akka] def typedActors() : ConcurrentHashMap[String, AnyRef] = {
RemoteServer.actorsFor(address).typedActors
}
private[akka] def actors() = RemoteServer.actorsFor(address).actors
private[akka] def typedActors() = RemoteServer.actorsFor(address).typedActors
}
object RemoteServerSslContext {