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

This got skipped when Tuple<String, Integer> became DObjectAddress, leaving

Browse Source 
us with lots of "Requested to clear unknown proxy" warnings in Spiral
Knights.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6606 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Andrzej Kapolka
2011-04-06 02:59:54 +00:00
parent f3d6712cd2
commit cd63a86bff
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/presents/peer/data/DObjectAddress.java
+5
View File
@@ -58,4 +58,9 @@ public class DObjectAddress extends SimpleStreamableObject
&& (nodeName == o.nodeName || (nodeName != null && nodeName.equals(o.nodeName))); && (nodeName == o.nodeName || (nodeName != null && nodeName.equals(o.nodeName)));
} }
@Override
public String toString ()
{
return "[nodeName=" + nodeName + ", oid=" + oid + "]";
}
} }
src/main/java/com/threerings/presents/peer/server/PeerManager.java
+1 -1
View File
@@ -617,7 +617,7 @@ public abstract class PeerManager
*/ */
public void unproxyRemoteObject (String nodeName, int remoteOid) public void unproxyRemoteObject (String nodeName, int remoteOid)
{ {
Tuple<String,Integer> key = Tuple.newTuple(nodeName, remoteOid); DObjectAddress key = new DObjectAddress(nodeName, remoteOid);
Tuple<Subscriber<?>, DObject> bits = _proxies.remove(key); Tuple<Subscriber<?>, DObject> bits = _proxies.remove(key);
if (bits == null) { if (bits == null) {
log.warning("Requested to clear unknown proxy", "key", key); log.warning("Requested to clear unknown proxy", "key", key);