From 2bb7f6e821c77a6395e14af11fc140022df17344 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Tue, 28 Dec 2010 14:58:07 +0000 Subject: [PATCH] If we're going to support the idea that things can log in without a body, we can't have the peer manager NPE when that happens. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6394 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/crowd/peer/server/CrowdPeerManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/threerings/crowd/peer/server/CrowdPeerManager.java b/src/main/java/com/threerings/crowd/peer/server/CrowdPeerManager.java index 29c5907ec..b2bab026e 100644 --- a/src/main/java/com/threerings/crowd/peer/server/CrowdPeerManager.java +++ b/src/main/java/com/threerings/crowd/peer/server/CrowdPeerManager.java @@ -142,7 +142,10 @@ public abstract class CrowdPeerManager extends PeerManager { super.initClientInfo(client, info); BodyObject body = _locator.forClient(client.getClientObject()); - ((CrowdClientInfo)info).visibleName = body.getVisibleName(); + // body-less entities don't get a visibleName and so can't take part in chatting + if (body != null) { + ((CrowdClientInfo)info).visibleName = body.getVisibleName(); + } } @Override // from PeerManager