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

Merge branch 'remove-cluster'

Browse source
This commit is contained in:
Viktor Klang 2010-11-12 14:16:07 +01:00
commit 7f3e65309d
7 changed files with 1 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -243,7 +243,6 @@ class RemoteServer extends Logging with ListenerManagement {
openChannels.add(bootstrap.bind(new InetSocketAddress(hostname, port)))
_isRunning = true
Cluster.registerLocalNode(hostname, port)
notifyListeners(RemoteServerStarted(this))
}
} catch {
@ -261,7 +260,6 @@ class RemoteServer extends Logging with ListenerManagement {
openChannels.disconnect
openChannels.close.awaitUninterruptibly
bootstrap.releaseExternalResources
Cluster.deregisterLocalNode(hostname, port)
notifyListeners(RemoteServerShutdown(this))
} catch {
case e: java.nio.channels.ClosedChannelException => {}
@ -595,7 +593,7 @@ class RemoteServerHandler(
if (request.getOneWay) messageReceiver.invoke(typedActor, args: _*)
else {
val result = messageReceiver.invoke(typedActor, args: _*) match {
case f: Future[_] => f.await.result.get
case f: Future[_] => f.await.result.get //TODO replace this with a Listener on the Future to avoid blocking
case other => other
}
log.debug("Returning result from remote typed actor invocation [%s]", result)