1025: some cleanup

This commit is contained in:
Peter Veentjer 2011-07-15 10:59:29 +03:00
parent 966f7d9297
commit 4017a86b4c
2 changed files with 25 additions and 25 deletions

View file

@ -477,12 +477,7 @@ class DefaultClusterNode private[akka](
def shutdown() { def shutdown() {
isConnected.switchOff { def shutdownNode() {
shutdownNode()
}
}
private def shutdownNode() {
ignore[ZkNoNodeException](zkClient.deleteRecursive(membershipNodePath)) ignore[ZkNoNodeException](zkClient.deleteRecursive(membershipNodePath))
locallyCachedMembershipNodes.clear() locallyCachedMembershipNodes.clear()
@ -506,6 +501,11 @@ class DefaultClusterNode private[akka](
EventHandler.info(this, "Cluster node shut down [%s]".format(nodeAddress)) EventHandler.info(this, "Cluster node shut down [%s]".format(nodeAddress))
} }
isConnected.switchOff {
shutdownNode()
}
}
def disconnect(): ClusterNode = { def disconnect(): ClusterNode = {
zkClient.unsubscribeAll() zkClient.unsubscribeAll()
zkClient.close() zkClient.close()