From f62498de20081bd2dba6b592ef0bb785e2e514a6 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 23 Mar 2007 20:45:58 +0000 Subject: [PATCH] Idempotency is always handy. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@264 c613c5cb-e716-0410-b11b-feb51c14d237 --- src/java/com/threerings/parlor/server/TableManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/parlor/server/TableManager.java b/src/java/com/threerings/parlor/server/TableManager.java index ebe1bf08..c6e1214b 100644 --- a/src/java/com/threerings/parlor/server/TableManager.java +++ b/src/java/com/threerings/parlor/server/TableManager.java @@ -86,11 +86,15 @@ public class TableManager */ public void shutdown () { - CrowdServer.invmgr.clearDispatcher(_tlobj.getTableService()); - _tlobj.setTableService(null); + if (_tlobj != null) { + CrowdServer.invmgr.clearDispatcher(_tlobj.getTableService()); + _tlobj.setTableService(null); + } if (_dobj instanceof PlaceObject) { _dobj.removeListener(this); } + _tlobj = null; + _dobj = null; } /**