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

Merged with master and fixed last issues

Browse source
This commit is contained in:
Jonas Bonér 2010-05-16 20:15:08 +02:00
commit 9aaad8c03c
66 changed files with 647 additions and 536 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-core/src/main/scala/remote/RemoteServer.scala
View file

@ -210,10 +210,11 @@ class RemoteServer extends Logging {
// TODO: register active object in RemoteServer as well
/**
* Register Remote Actor by the Actor's 'id' field.
* Register Remote Actor by the Actor's 'id' field. It starts the Actor if it is not started already.
*/
def register(actorRef: ActorRef) = synchronized {
if (_isRunning) {
if (!actorRef.isRunning) actorRef.start
log.info("Registering server side remote actor [%s] with id [%s]", actorRef.actorClass.getName, actorRef.id)
RemoteServer.actorsFor(RemoteServer.Address(hostname, port)).actors.put(actorRef.id, actorRef)
}
@ -226,6 +227,7 @@ class RemoteServer extends Logging {
*/
def register(id: String, actorRef: ActorRef) = synchronized {
if (_isRunning) {
if (!actorRef.isRunning) actorRef.start
log.info("Registering server side remote actor [%s] with id [%s]", actorRef.actorClass.getName, id)
RemoteServer.actorsFor(RemoteServer.Address(hostname, port)).actors.put(id, actorRef)
}
@ -476,8 +478,8 @@ class RemoteServerHandler(
try {
log.info("Creating a new remote actor [%s:%s]", name, uuid)
val clazz = if (applicationLoader.isDefined) applicationLoader.get.loadClass(name)
else Class.forName(name)
val actorRef = Actor.newActor(() => clazz.newInstance.asInstanceOf[Actor])
else Class.forName(name)
val actorRef = Actor.actorOf(clazz.newInstance.asInstanceOf[Actor])
actorRef.uuid = uuid
actorRef.timeout = timeout
actorRef.remoteAddress = None