The PeerNode is the thing that calls clientLoggedOn/Off on the PeerManager,
so let's keep with that pattern for any clients there when the peer itself connects or disconnects. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5713 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -1035,9 +1035,8 @@ public abstract class PeerManager
|
||||
*/
|
||||
protected void connectedToPeer (PeerNode peer)
|
||||
{
|
||||
String nodeName = peer.getNodeName();
|
||||
|
||||
// check for lock conflicts
|
||||
String nodeName = peer.getNodeName();
|
||||
for (NodeObject.Lock lock : peer.nodeobj.locks) {
|
||||
PeerManager.LockHandler handler = _locks.get(lock);
|
||||
if (handler != null) {
|
||||
@@ -1051,11 +1050,6 @@ public abstract class PeerManager
|
||||
droppedLock(lock);
|
||||
}
|
||||
}
|
||||
|
||||
// indicate that all these clients have logged on
|
||||
for (ClientInfo clinfo : peer.nodeobj.clients) {
|
||||
clientLoggedOn(nodeName, clinfo);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1063,19 +1057,13 @@ public abstract class PeerManager
|
||||
*/
|
||||
protected void disconnectedFromPeer (PeerNode peer)
|
||||
{
|
||||
String nodeName = peer.getNodeName();
|
||||
|
||||
// clear any locks held by that peer
|
||||
String nodeName = peer.getNodeName();
|
||||
for (LockHandler handler : _locks.values().toArray(new LockHandler[_locks.size()])) {
|
||||
if (handler.getNodeName().equals(nodeName)) {
|
||||
handler.clientDidLogoff();
|
||||
}
|
||||
}
|
||||
|
||||
// indicate that these clients have left
|
||||
for (ClientInfo clinfo : peer.nodeobj.clients) {
|
||||
clientLoggedOff(nodeName, clinfo);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user