From 44a4981d27de7194c352928c4723cfa88d82aac5 Mon Sep 17 00:00:00 2001
From: Jamie Doornbos <jamie@threerings.net>
Date: Wed, 14 Jan 2009 23:28:16 +0000
Subject: [PATCH] Stop trying to flush clients after the server shuts down

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5633 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/presents/server/ClientManager.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java
index d49fcfa79..be933a5a3 100644
--- a/src/java/com/threerings/presents/server/ClientManager.java
+++ b/src/java/com/threerings/presents/server/ClientManager.java
@@ -105,12 +105,13 @@ public class ClientManager
 
         // start up an interval that will check for expired clients and flush them from the bowels
         // of the server
-        new Interval(omgr) {
+        _flushClients = new Interval(omgr) {
             @Override
             public void expired () {
                 flushClients();
             }
-        }.schedule(CLIENT_FLUSH_INTERVAL, true);
+        };
+        _flushClients.schedule(CLIENT_FLUSH_INTERVAL, true);
     }
 
     /**
@@ -127,6 +128,8 @@ public class ClientManager
     {
         log.info("Client manager shutting down [ccount=" + _usermap.size() + "].");
 
+        _flushClients.cancel();
+
         // inform all of our clients that they are being shut down
         synchronized (_usermap) {
             for (PresentsSession pc : _usermap.values()) {
@@ -573,6 +576,9 @@ public class ClientManager
     /** Tracks registered {@link ClientObserver}s. */
     protected ObserverList<ClientObserver> _clobservers = ObserverList.newSafeInOrder();
 
+    /** Interval to flush expired clients. */
+    protected Interval _flushClients;
+
     // our injected dependencies
     @Inject protected PresentsDObjectMgr _omgr;