From 0da49cb6abccc9fae07fa593f0c96731ec2e28f6 Mon Sep 17 00:00:00 2001 From: Charlie Groves Date: Wed, 18 Mar 2009 20:14:15 +0000 Subject: [PATCH] Uhh, might want to handle PresentsSession.getInetAddress returning null for disconnected clients git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5687 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/server/ClientManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java index 2feaaebcf..09ec5c810 100644 --- a/src/java/com/threerings/presents/server/ClientManager.java +++ b/src/java/com/threerings/presents/server/ClientManager.java @@ -190,7 +190,11 @@ public class ClientManager List sessions = Lists.newArrayListWithExpectedSize(1); synchronized (_usermap) { for (PresentsSession session : _usermap.values()) { - if (Arrays.equals(addr, session.getInetAddress().getAddress())) { + InetAddress sessionAddr = session.getInetAddress(); + if (sessionAddr == null) { + continue; + } + if (Arrays.equals(addr, sessionAddr.getAddress())) { sessions.add(session); } }