Fixes #1342

Atmosphere · Oct 15, 2013 · fae5113 · fae5113
1 parent ebbaa7e
commit fae5113
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/interceptor/AtmosphereResourceStateRecovery.java b/modules/cpr/src/main/java/org/atmosphere/interceptor/AtmosphereResourceStateRecovery.java
@@ -185,18 +185,26 @@ public void onAddAtmosphereResource(Broadcaster b, AtmosphereResource r) {
             if (t == null) {
                 t = track(r);
             }
+            logger.trace("Starting tracking the state of {} with broadcaster {}", r.uuid(), b.getID());
             t.add(b);
         }
 
         @Override
         public void onRemoveAtmosphereResource(Broadcaster b, AtmosphereResource r) {
             // We track cancelled and resumed connection only.
             BroadcasterTracker t = states.get(r.uuid());
+
+            // The BroadcasterTracker was swapped
+            if (t == null) {
+                onAddAtmosphereResource(b, r);
+            }
+
             AtmosphereResourceEvent e = r.getAtmosphereResourceEvent();
             if (t != null && (e.isClosedByClient() || !r.isResumed() && !e.isResumedOnTimeout())) {
                 t.remove(b);
             } else {
                 logger.trace("Keeping the state of {} with broadcaster {}", r.uuid(), b.getID());
+                logger.trace("State for {} with broadcaster {}", r.uuid(), t != null ? t.ids() : "null");
             }
         }
     }