Merging with master

This commit is contained in:
Viktor Klang 2011-11-10 18:06:16 +01:00
commit 1fb1309dc3
48 changed files with 757 additions and 541 deletions

View file

@ -155,7 +155,7 @@ class Gossiper(remote: Remote) {
node oldAvailableNodes
if connectionManager.connectionFor(node).isEmpty
} {
val connectionFactory = () RemoteActorRef(remote.server, gossipingNode, remote.remoteDaemonServiceName, None)
val connectionFactory = () RemoteActorRef(remote.server, gossipingNode, remote.remoteDaemon.path, None)
connectionManager.putIfAbsent(node, connectionFactory) // create a new remote connection to the new node
oldState.nodeMembershipChangeListeners foreach (_ nodeConnected node) // notify listeners about the new nodes
}
@ -308,7 +308,7 @@ class Gossiper(remote: Remote) {
RemoteSystemDaemonMessageProtocol.newBuilder
.setMessageType(GOSSIP)
.setActorAddress(remote.remoteDaemonServiceName)
.setActorPath(remote.remoteDaemon.path.toString)
.setPayload(ByteString.copyFrom(gossipAsBytes))
.build()
}