From 64115155ec219836b32d4a617d81b1c7d9f9d11b Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sat, 8 Nov 2008 03:35:02 +0000
Subject: [PATCH] Shut down our flusher when we're cleaned up.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5529 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../presents/client/ClientDObjectMgr.java     | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java
index 58daba5f8..4b233dc37 100644
--- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java
+++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java
@@ -89,12 +89,12 @@ public class ClientDObjectMgr
         });
 
         // register a flush interval
-        new Interval(client.getRunQueue()) {
-            @Override
-            public void expired () {
+        _flusher = new Interval(client.getRunQueue()) {
+            @Override public void expired () {
                 flushObjects();
             }
-        }.schedule(FLUSH_INTERVAL, true);
+        };
+        _flusher.schedule(FLUSH_INTERVAL, true);
     }
 
     // documentation inherited from interface
@@ -162,10 +162,14 @@ public class ClientDObjectMgr
      */
     public void processMessage (Message msg)
     {
-        // append it to our queue
-        _actions.append(msg);
-        // and queue ourselves up to be run
-        _client.getRunQueue().postRunnable(this);
+        if (_client.getRunQueue().isRunning()) {
+            // append it to our queue
+            _actions.append(msg);
+            // and queue ourselves up to be run
+            _client.getRunQueue().postRunnable(this);
+        } else {
+            log.info("Dropping message as RunQueue is shutdown", "msg", msg);
+        }
     }
 
     /**
@@ -230,15 +234,20 @@ public class ClientDObjectMgr
             }
         }
         _penders.clear();
+        _flusher.cancel();
     }
 
-    protected <T extends DObject> void queueAction (
-        int oid, Subscriber<T> target, boolean subscribe)
+    protected <T extends DObject> void queueAction (int oid, Subscriber<T> target, boolean subscribe)
     {
-        // queue up an action
-        _actions.append(new ObjectAction<T>(oid, target, subscribe));
-        // and queue up the omgr to get invoked on the invoker thread
-        _client.getRunQueue().postRunnable(this);
+        if (_client.getRunQueue().isRunning()) {
+            // queue up an action
+            _actions.append(new ObjectAction<T>(oid, target, subscribe));
+            // and queue up the omgr to get invoked on the invoker thread
+            _client.getRunQueue().postRunnable(this);
+        } else {
+            log.info("Dropping subscribe action as RunQueue is stopped",
+                     "oid", oid, "subscribe", subscribe);
+        }
     }
 
     /**
@@ -518,6 +527,9 @@ public class ClientDObjectMgr
     /** A reference to our client instance. */
     protected Client _client;
 
+    /** Periodically calls {@link #flushObject}. */
+    protected Interval _flusher;
+
     /** Our primary dispatch queue. */
     protected Queue<Object> _actions = new Queue<Object>();