Fix for #115 DefaultBroadcaster.push contains recursive error

Atmosphere · Mar 30, 2012 · b9c26bc · b9c26bc
1 parent fb2609b
commit b9c26bc
Showing 1 changed file with 6 additions and 2 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
@@ -532,6 +532,10 @@ protected void start() {
     }
 
     protected void push(Entry entry) {
+        push(entry, true);
+    }
+
+    protected void push(Entry entry, boolean rec) {
 
         if (destroyed.get()) {
             return;
@@ -542,7 +546,7 @@ protected void push(Entry entry) {
             recentActivity.set(true);
 
             String prevMessage = entry.message.toString();
-            if (!delayedBroadcast.isEmpty()) {
+            if (rec && !delayedBroadcast.isEmpty()) {
                 Iterator<Entry> i = delayedBroadcast.iterator();
                 StringBuilder b = new StringBuilder();
                 while (i.hasNext()) {
@@ -554,7 +558,7 @@ protected void push(Entry entry) {
                                 && entry.message instanceof String) {
                             b.append(e.message);
                         } else {
-                            push(e);
+                            push(e, false);
                         }
                     } finally {
                         i.remove();