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
2010-12-02 00:17:02 +00:00
parent 4c0224f835
commit 7f765020a9
1 changed files with 2 additions and 1 deletions
@@ -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) {