Merge branch 'master' of git@github.com:jboner/akka

2009-12-21 08:01:37 +01:00 · 2009-12-21 08:01:37 +01:00 · 4012c79c78
commit 4012c79c78
parent 6c9795a371 0bf3efbc64
9 changed files with 271 additions and 56 deletions
--- a/akka-core/src/main/scala/remote/RemoteServer.scala
+++ b/akka-core/src/main/scala/remote/RemoteServer.scala
@ -118,12 +118,14 @@ class RemoteServer extends Logging {
      bootstrap.setOption("child.connectTimeoutMillis", RemoteServer.CONNECTION_TIMEOUT_MILLIS)
      openChannels.add(bootstrap.bind(new InetSocketAddress(hostname, port)))
      isRunning = true
+      Cluster.registerLocalNode(hostname,port)
    }
  }

  def shutdown = {
    openChannels.close.awaitUninterruptibly()
    bootstrap.releaseExternalResources
+    Cluster.deregisterLocalNode(hostname,port)
  }
 }