Improve fix for #1342

Atmosphere · Oct 15, 2013 · 7cbfbc7 · 7cbfbc7
1 parent fae5113
commit 7cbfbc7
Showing 1 changed file with 5 additions and 6 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
@@ -193,16 +193,15 @@ public void onAddAtmosphereResource(Broadcaster b, AtmosphereResource r) {
         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 {
+
+                // The BroadcasterTracker was swapped
+                if (t == null) {
+                    onAddAtmosphereResource(b, r);
+                }
                 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");
             }