diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java index 44f7c0434..7cfe888d1 100644 --- a/src/java/com/threerings/presents/peer/server/PeerManager.java +++ b/src/java/com/threerings/presents/peer/server/PeerManager.java @@ -503,6 +503,7 @@ public abstract class PeerManager final Map results = Maps.newHashMap(); final Map failures = Maps.newHashMap(); + final Set completedNodes = Sets.newHashSet(); for (final String node : nodes) { invokeNodeRequest(node, requestBytes, new InvocationService.ResultListener() { public void requestProcessed (Object result) { @@ -517,8 +518,8 @@ public abstract class PeerManager nodeDone(node); } protected void nodeDone (String node) { - nodes.remove(node); - if (nodes.isEmpty()) { + completedNodes.add(node); + if (nodes.size() == completedNodes.size()) // if all nodes have responded, let caller know listener.requestsProcessed(new NodeRequestsResultImpl(results, failures)); }