Port fix for #766

Atmosphere · Jan 14, 2013 · 4b8f5b6 · 4b8f5b6
1 parent 4a5ef54
commit 4b8f5b6
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cache/AbstractBroadcasterCache.java b/modules/cpr/src/main/java/org/atmosphere/cache/AbstractBroadcasterCache.java
@@ -67,6 +67,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -80,10 +81,9 @@ public abstract class AbstractBroadcasterCache implements BroadcasterCache {
     protected static final Logger logger = LoggerFactory.getLogger(AbstractBroadcasterCache.class);
 
     protected final List<CachedMessage> queue = Collections.synchronizedList(new LinkedList<CachedMessage>());
-
     protected ScheduledExecutorService reaper = Executors.newSingleThreadScheduledExecutor();
-
     protected int maxCachedinMs = 1000 * 5 * 60;
+    protected ScheduledFuture scheduledFuture;
 
     public AbstractBroadcasterCache() {
     }
@@ -92,7 +92,7 @@ public AbstractBroadcasterCache() {
      * {@inheritDoc}
      */
     public final void start() {
-        reaper.scheduleAtFixedRate(new Runnable() {
+        scheduledFuture = reaper.scheduleAtFixedRate(new Runnable() {
 
             public void run() {
                 synchronized (AbstractBroadcasterCache.this) {
@@ -115,6 +115,11 @@ public void run() {
     }
 
     public void setExecutorService(ScheduledExecutorService reaper){
+        if (scheduledFuture != null) {
+            scheduledFuture.cancel(false);
+            scheduledFuture = null;
+        }
+
         if (reaper != null) {
             stop();
         }
@@ -218,10 +223,10 @@ public final synchronized List<Object> retrieveFromCache(String id, AtmosphereRe
 
         return l;
     }
-    
+
     /**
      * Get the number of messages which are currently in the cache.
-     * 
+     *
      * @return the number of messages which are currently in the cache
      */
     public int getQueueDepth() {