gc

Improved fix for #170 [long-polling] Message losts during concurrent suspend/broadcast
Atmosphere · Feb 1, 2012 · 01a1988 · 01a1988
1 parent a72bc42
commit 01a1988
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java
@@ -232,8 +232,6 @@ public synchronized void resume() {
             }
         } catch (Throwable t) {
             logger.trace("Wasn't able to resume a connection {}", this, t);
-        } finally {
-            event.setMessage(null);
         }
     }
 

diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcaster.java b/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcaster.java
@@ -729,7 +729,6 @@ protected void executeAsyncWrite(final AsyncWriteToken token) {
                 cacheLostMessage(r, token);
             }
             token.destroy();
-            event.setMessage(null);
         }
     }
 
@@ -1034,8 +1033,11 @@ public <T> Future<T> broadcast(T msg, Set<AtmosphereResource<?, ?>> subset) {
                     BroadcasterFactory.getDefault().add(this, name);
                 }
 
-                resources.add(r);
                 checkCachedAndPush(r, r.getAtmosphereResourceEvent());
+                if (!AtmosphereResourceImpl.class.cast(r).isResumed() ||
+                        AtmosphereResourceImpl.class.cast(r).isCancelled()) {
+                    resources.add(r);
+                }
             }
         } finally {
             // OK reset

diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/util/JerseyBroadcasterUtil.java b/modules/jersey/src/main/java/org/atmosphere/jersey/util/JerseyBroadcasterUtil.java
@@ -65,11 +65,11 @@ public final static void broadcast(final AtmosphereResource<?, ?> r, final Atmos
                     cr.setResponse(Response.ok(msg).build());
                     cr.getHttpHeaders().add(HttpHeaders.CONTENT_TYPE, m);
                     cr.write();
-                }
 
-                // https://github.com/Atmosphere/atmosphere/issues/169
-                if (!cr.isCommitted()) {
-                    cr.getOutputStream().flush();
+                    // https://github.com/Atmosphere/atmosphere/issues/169
+                    if (!cr.isCommitted()) {
+                        cr.getOutputStream().flush();
+                    }
                 }
             } else {
                 if (e.getMessage() == null) {
@@ -87,7 +87,7 @@ public final static void broadcast(final AtmosphereResource<?, ?> r, final Atmos
             if (DefaultBroadcaster.class.isAssignableFrom(broadcaster.getClass())) {
                 DefaultBroadcaster.class.cast(broadcaster).onException(t, r);
             } else {
-                onException(t,r);
+                onException(t, r);
             }
         } finally {
             if (cr != null) {