Fix race condition if two messages are broadcast to the same resource…

… in very close succession
Atmosphere · Apr 3, 2011 · eb696da · eb696da
1 parent 03baa5c
commit eb696da
Showing 1 changed file with 28 additions and 28 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
@@ -428,34 +428,34 @@ private Object translate(Object msg) {
 
     protected void executeAsyncWrite(final AtmosphereResource<?, ?> resource, final Object msg, final BroadcasterFuture future) {
 
-        synchronized (resource) {
-            if (resource.getAtmosphereResourceEvent().isCancelled()) {
-                return;
-            }
-
-            final AtmosphereResourceEvent event = resource.getAtmosphereResourceEvent();
-            event.setMessage(msg);
-
-            if (resource.getAtmosphereResourceEvent() != null && !resource.getAtmosphereResourceEvent().isCancelled()
-                    && HttpServletRequest.class.isAssignableFrom(resource.getRequest().getClass())) {
-                try {
-                    HttpServletRequest.class.cast(resource.getRequest())
-                            .setAttribute(CometSupport.MAX_INACTIVE, System.currentTimeMillis());
-                }
-                catch (Exception t) {
-                    // Shield us from any corrupted Request
-                    logger.warn("Preventing corruption of a recycled request: resource" + resource, event);
-                    resources.remove(resource);
-                    if (future != null) {
-                        future.cancel(true);
+        bc.getAsyncWriteService().execute(new Runnable(){
+            @Override
+            public void run() {
+                synchronized (resource) {
+                    if (resource.getAtmosphereResourceEvent().isCancelled()) {
+                        return;
+                    }
+
+                    final AtmosphereResourceEvent event = resource.getAtmosphereResourceEvent();
+                    event.setMessage(msg);
+
+                    if (resource.getAtmosphereResourceEvent() != null && !resource.getAtmosphereResourceEvent().isCancelled()
+                            && HttpServletRequest.class.isAssignableFrom(resource.getRequest().getClass())) {
+                        try {
+                            HttpServletRequest.class.cast(resource.getRequest())
+                                    .setAttribute(CometSupport.MAX_INACTIVE, System.currentTimeMillis());
+                        }
+                        catch (Exception t) {
+                            // Shield us from any corrupted Request
+                            logger.warn("Preventing corruption of a recycled request: resource" + resource, event);
+                            resources.remove(resource);
+                            if (future != null) {
+                                future.cancel(true);
+                            }
+                            return;
+                        }
                     }
-                    return;
-                }
-            }
 
-            bc.getAsyncWriteService().execute(new Runnable(){
-                @Override
-                public void run() {
                     broadcast(resource, event);
                     if (resource instanceof AtmosphereEventLifecycle) {
                         ((AtmosphereEventLifecycle) resource).notifyListeners();
@@ -464,8 +464,8 @@ public void run() {
                         future.done();
                     }
                 }
-            });
-        }
+            }
+        });
     }
 
     protected void checkCachedAndPush(final AtmosphereResource<?, ?> r, final AtmosphereResourceEvent e) {