From 5def25058a209f948bff4ad30e6fa346e760200a Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Tue, 18 Jul 2006 01:08:31 +0000
Subject: [PATCH] Avoid sticking a fork in things if we are asked to remove a
 null key.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4268 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/presents/dobj/DSet.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/java/com/threerings/presents/dobj/DSet.java b/src/java/com/threerings/presents/dobj/DSet.java
index 6f61b383c..ab0819862 100644
--- a/src/java/com/threerings/presents/dobj/DSet.java
+++ b/src/java/com/threerings/presents/dobj/DSet.java
@@ -324,6 +324,13 @@ public class DSet<E extends DSet.Entry>
      */
     protected E removeKey (Comparable key)
     {
+        // don't fail, but generate a warning if we're passed a null key
+        if (key == null) {
+            Log.warning("Requested to remove null key.");
+            Thread.dumpStack();
+            return null;
+        }
+
         // look up this entry's position in our set
         int eidx = ArrayUtil.binarySearch(
             _entries, 0, _size, key, ENTRY_COMP);