AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add unproxyRemoteObject(DObjectAddress) to complement unproxyRemoteObject(nodeName, oid)

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6688 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Charlie Groves
2011-07-29 08:54:45 +00:00
parent e9f3cb9b9a
commit 791dc95ea3
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/presents/peer/server/PeerManager.java
+18 -9
View File
@@ -612,42 +612,51 @@ public abstract class PeerManager
}); });
} }
/** /**
* Unsubscribes from and clears a proxied object. The caller must be sure that there are no * Unsubscribes from and clears a proxied object. The caller must be sure that there are no
* remaining subscribers to the object on this local server. * remaining subscribers to the object on this local server.
*/ */
public void unproxyRemoteObject (String nodeName, int remoteOid) public void unproxyRemoteObject (String nodeName, int remoteOid)
{ {
DObjectAddress key = new DObjectAddress(nodeName, remoteOid); unproxyRemoteObject(new DObjectAddress(nodeName, remoteOid));
Tuple<Subscriber<?>, DObject> bits = _proxies.remove(key); }
/**
* Unsubscribes from and clears a proxied object. The caller must be sure that there are no
* remaining subscribers to the object on this local server.
*/
public void unproxyRemoteObject (DObjectAddress addr)
{
Tuple<Subscriber<?>, DObject> bits = _proxies.remove(addr);
if (bits == null) { if (bits == null) {
log.warning("Requested to clear unknown proxy", "key", key); log.warning("Requested to clear unknown proxy", "addr", addr);
return; return;
} }
// If it's local, just remove the subscriber we added and bail // If it's local, just remove the subscriber we added and bail
if (key.nodeName.equals(_nodeName)) { if (addr.nodeName.equals(_nodeName)) {
bits.right.removeSubscriber(bits.left); bits.right.removeSubscriber(bits.left);
return; return;
} }
// clear out the local object manager's proxy mapping // clear out the local object manager's proxy mapping
_omgr.clearProxyObject(remoteOid, bits.right); _omgr.clearProxyObject(addr.oid, bits.right);
final Client peer = getPeerClient(nodeName); final Client peer = getPeerClient(addr.nodeName);
if (peer == null) { if (peer == null) {
log.warning("Unable to unsubscribe from proxy, missing peer", "key", key); log.warning("Unable to unsubscribe from proxy, missing peer", "addr", addr);
return; return;
} }
// restore the object's omgr reference to our ClientDObjectMgr and its oid back to the // restore the object's omgr reference to our ClientDObjectMgr and its oid back to the
// remote oid so that it can properly finish the unsubscription process // remote oid so that it can properly finish the unsubscription process
bits.right.setOid(remoteOid); bits.right.setOid(addr.oid);
bits.right.setManager(peer.getDObjectManager()); bits.right.setManager(peer.getDObjectManager());
// finally unsubscribe from the object on our peer // finally unsubscribe from the object on our peer
peer.getDObjectManager().unsubscribeFromObject(remoteOid, bits.left); peer.getDObjectManager().unsubscribeFromObject(addr.oid, bits.left);
} }
/** /**