From cd63a86bff9b46a2efb4c12053ce56ca71a6204c Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <andrzej@threerings.net>
Date: Wed, 6 Apr 2011 02:59:54 +0000
Subject: [PATCH] This got skipped when Tuple<String, Integer> became
 DObjectAddress, leaving 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
---
 .../com/threerings/presents/peer/data/DObjectAddress.java    | 5 +++++
 .../com/threerings/presents/peer/server/PeerManager.java     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/threerings/presents/peer/data/DObjectAddress.java b/src/main/java/com/threerings/presents/peer/data/DObjectAddress.java
index 1d21aa322..4f93b47a6 100644
--- a/src/main/java/com/threerings/presents/peer/data/DObjectAddress.java
+++ b/src/main/java/com/threerings/presents/peer/data/DObjectAddress.java
@@ -58,4 +58,9 @@ public class DObjectAddress extends SimpleStreamableObject
             && (nodeName == o.nodeName || (nodeName != null && nodeName.equals(o.nodeName)));
     }
 
+    @Override
+    public String toString ()
+    {
+        return "[nodeName=" + nodeName + ", oid=" + oid + "]";
+    }
 }
diff --git a/src/main/java/com/threerings/presents/peer/server/PeerManager.java b/src/main/java/com/threerings/presents/peer/server/PeerManager.java
index fc6ca7d8d..9d2c39055 100644
--- a/src/main/java/com/threerings/presents/peer/server/PeerManager.java
+++ b/src/main/java/com/threerings/presents/peer/server/PeerManager.java
@@ -617,7 +617,7 @@ public abstract class PeerManager
      */
     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);
         if (bits == null) {
             log.warning("Requested to clear unknown proxy", "key", key);