Fix for #974

Atmosphere · Mar 25, 2013 · 154ede6 · 154ede6
1 parent da76b3d
commit 154ede6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 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
@@ -557,9 +557,10 @@ public String toString() {
     }
 
     protected Runnable getBroadcastHandler() {
+        final AtomicBoolean init = new AtomicBoolean(true);
         return new Runnable() {
             public void run() {
-                while (!isDestroyed() && !outOfOrderBroadcastSupported.get()) {
+                while (init.getAndSet(false) || (!isDestroyed() && !outOfOrderBroadcastSupported.get())) {
                     Entry msg = null;
                     try {
                         msg = messages.poll(waitTime, TimeUnit.MILLISECONDS);
@@ -573,6 +574,7 @@ public void run() {
                         return;
                     } finally {
                         if (outOfOrderBroadcastSupported.get()) {
+                            init.set(true);
                             bc.getExecutorService().submit(this);
                         }
                     }
@@ -595,9 +597,10 @@ public void run() {
     }
 
     protected Runnable getAsyncWriteHandler(final WriteQueue writeQueue) {
+        final AtomicBoolean init = new AtomicBoolean(true);
         return new Runnable() {
             public void run() {
-                while (!isDestroyed() && !outOfOrderBroadcastSupported.get()) {
+                while (init.getAndSet(false) || (!isDestroyed() && !outOfOrderBroadcastSupported.get())) {
                     AsyncWriteToken token = null;
                     try {
                         token = writeQueue.queue.poll(waitTime, TimeUnit.MILLISECONDS);
@@ -615,9 +618,9 @@ public void run() {
                         logger.trace("", ex);
                         return;
                     } finally {
-                        if (!bc.getAsyncWriteService().isShutdown() && token == null && outOfOrderBroadcastSupported.get()) {
+                        if (!bc.getAsyncWriteService().isShutdown() && outOfOrderBroadcastSupported.get()) {
+                            init.set(true);
                             bc.getAsyncWriteService().submit(this);
-                            return;
                         }
                     }
 

diff --git a/samples/chat/src/main/webapp/WEB-INF/web.xml b/samples/chat/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://java.sun.com/xml/ns/j2ee/web-app_2.5.xsd">
+    xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://java.sun.com/xml/ns/j2ee/web-app_2.5.xsd">
 
     <description>Atmosphere Chat</description>
     <display-name>Atmosphere Chat</display-name>
@@ -12,6 +12,10 @@
         <servlet-class>org.atmosphere.cpr.AtmosphereServlet</servlet-class>
         <async-supported>true</async-supported>
         <load-on-startup>0</load-on-startup>
+        <init-param>
+            <param-name>org.atmosphere.cpr.Broadcaster.supportOutOfOrderBroadcast</param-name>
+            <param-value>true</param-value>
+        </init-param>
     </servlet>
     <servlet-mapping>
         <servlet-name>AtmosphereServlet</servlet-name>