Make the safesub a little nicer about an unsubscribe() request that comes

on the heels of a requestFailed(). They don't have to do it, but it's
easier to just always call unsubscribe() whether things succeeded or
failed, so we'll quietly allow an unsubscribe() even if we have no object
or nothin'.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2905 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/presents/util/SafeSubscriber.java

@@ -1,5 +1,5 @@
 //
-// $Id: SafeSubscriber.java,v 1.1 2003/12/11 18:36:55 mdb Exp $
+// $Id: SafeSubscriber.java,v 1.2 2003/12/11 18:46:02 mdb Exp $
 
 package com.threerings.presents.util;
 
@@ -88,9 +88,15 @@ public class SafeSubscriber
     public void unsubscribe (DObjectManager omgr)
     {
         if (!_active) {
-            Log.warning("Unactive safesub asked to unsubscribe " + this + ".");
+            // we may be non-active and have no object which could mean
+            // that subscription failed; in which case we don't want to
+            // complain about anything, just quietly ignore the
+            // unsubscribe request
+            if (_object == null && !_pending) {
+                return;
+            }
+            Log.warning("Inactive safesub asked to unsubscribe " + this + ".");
             Thread.dumpStack();
-            // but go ahead anyway in case we are subscribed
         }
 
         // note that we no longer desire to be subscribed