Fix for https://atmosphere.dev.java.net/issues/show_bug.cgi?id=66

("AtmosphereResourceEventListener should be invoked after the real broadcast") See issue description
Atmosphere · Oct 6, 2010 · cb3722a · cb3722a
1 parent 8c78a93
commit cb3722a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcaster.java b/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcaster.java
@@ -119,6 +119,7 @@ public void destroy() {
         broadcasterCache = null;
         started.set(false);
         destroyed.set(true);
+        BroadcasterFactory.getDefault().remove(this, name);
     }
 
     /**
@@ -304,9 +305,6 @@ protected void push(AtmosphereResource<?, ?> r, Object msg) {
             trackBroadcastMessage(r, msg);
             e = r.getAtmosphereResourceEvent();
             e.setMessage(msg);
-            if (r instanceof AtmosphereEventLifecycle) {
-                ((AtmosphereEventLifecycle) r).notifyListeners();
-            }
 
             if (r.getAtmosphereResourceEvent() != null && !r.getAtmosphereResourceEvent().isCancelled()
                     && HttpServletRequest.class.isAssignableFrom(r.getRequest().getClass())) {
@@ -322,6 +320,9 @@ protected void push(AtmosphereResource<?, ?> r, Object msg) {
                 }
             }
             broadcast(r, e);
+            if (r instanceof AtmosphereEventLifecycle) {
+                ((AtmosphereEventLifecycle) r).notifyListeners();
+            }
         }
     }