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

Removing erronous use of uuid and replaced with id

Browse source
This commit is contained in:
Viktor Klang 2010-09-07 12:54:10 +02:00
parent 456fd074d4
commit 0085dd6504
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -829,9 +829,8 @@ class LocalActorRef private[akka](
actor.shutdown
ActorRegistry.unregister(this)
if (isRemotingEnabled) {
remoteAddress.foreach { address =>
RemoteClientModule.unregister(address, uuid)
}
if(remoteAddress.isDefined)
RemoteClientModule.unregister(remoteAddress.get, uuid)
RemoteServerModule.unregister(this)
}
nullOutActorRefReferencesFor(actorInstance.get)

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

@ -276,7 +276,7 @@ class RemoteServer extends Logging with ListenerManagement {
/**
* Register Remote Actor by the Actor's 'uuid' 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
}
}