Merge commit 'upstream/master'

This commit is contained in:
Jan Van Besien 2010-03-04 09:32:31 +01:00
commit 00966fdee6

View file

@ -35,14 +35,21 @@ trait BootableRemoteActorService extends Bootable with Logging {
super.onLoad
}
abstract override def onUnload = {
super.onUnload
if (remoteServerThread.isAlive) {
log.info("Shutting down Remote Actors Service")
RemoteNode.shutdown
remoteServerThread.join(1000)
}
super.onUnload
log.info("Shutting down Remote Actors Service")
RemoteNode.shutdown
if (remoteServerThread.isAlive)
remoteServerThread.join(1000)
log.info("Shutting down Cluster")
Cluster.shutdown
log.info("Remote Actors Service has been shut down")
}
}