From 7f765020a9f168ea7b67aed26956157d516c80a7 Mon Sep 17 00:00:00 2001 From: Mike Thomas Date: Thu, 2 Dec 2010 00:17:02 +0000 Subject: [PATCH] Since we're in the middle of reporting a failure, this can be due to an already-disappeared client-obj. If so, let's not NPE and just log a nice friendly null. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6325 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../java/com/threerings/presents/server/PresentsSession.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/threerings/presents/server/PresentsSession.java b/src/main/java/com/threerings/presents/server/PresentsSession.java index 16e596662..e4d0bbec9 100644 --- a/src/main/java/com/threerings/presents/server/PresentsSession.java +++ b/src/main/java/com/threerings/presents/server/PresentsSession.java @@ -284,8 +284,9 @@ public class PresentsSession } public void resolutionFailed (Name username, Exception reason) { + String oldName = _clobj == null ? null : _clobj.username; log.warning("Unable to resolve new client object", - "oldname", _clobj.username, "newname", username, "reason", reason, reason); + "oldname", oldName, "newname", username, "reason", reason, reason); // let our listener know we're hosed if (ucl != null) {