From 5418ffd2fd0702435087761c766a7d0638c78e73 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 9 Dec 2003 20:41:23 +0000 Subject: [PATCH] We love to be robust. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2897 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/presents/server/InvocationManager.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/java/com/threerings/presents/server/InvocationManager.java b/src/java/com/threerings/presents/server/InvocationManager.java index 367aa2088..528cda223 100644 --- a/src/java/com/threerings/presents/server/InvocationManager.java +++ b/src/java/com/threerings/presents/server/InvocationManager.java @@ -1,5 +1,5 @@ // -// $Id: InvocationManager.java,v 1.18 2003/10/26 02:45:19 mdb Exp $ +// $Id: InvocationManager.java,v 1.19 2003/12/09 20:41:23 mdb Exp $ package com.threerings.presents.server; @@ -124,6 +124,12 @@ public class InvocationManager */ public void clearDispatcher (InvocationMarshaller marsh) { + if (marsh == null) { + Log.warning("Refusing to unregister null marshaller."); + Thread.dumpStack(); + return; + } + if (_dispatchers.remove(marsh.getInvocationCode()) == null) { Log.warning("Requested to remove unregistered marshaller? " + "[marsh=" + marsh + "].");