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

("Delayed/buffered broadcast not cleared when @schedule is used") See decription within the issue.
Atmosphere · Sep 13, 2010 · 707b61c · 707b61c
1 parent 7cba387
commit 707b61c
Showing 1 changed file with 3 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
@@ -246,6 +246,7 @@ public void run() {
 
     protected void push(Entry msg) {
 
+        String prevMessage = msg.message.toString();
         if (!delayedBroadcast.isEmpty()) {
             Iterator<Entry> i = delayedBroadcast.iterator();
             while (i.hasNext()) {
@@ -257,8 +258,7 @@ protected void push(Entry msg) {
                     // Append so we do a single flush
                     if (e.message instanceof String
                             && msg.message instanceof String) {
-                        msg.message = e.message.toString()
-                                + msg.message.toString();
+                        msg.message = e.message + msg.message.toString();
                     } else {
                         push(e);
                     }
@@ -287,6 +287,7 @@ protected void push(Entry msg) {
                 push(r, msg.message);
             }
         }
+        msg.message = prevMessage;
     }
 
     protected void push(AtmosphereResource<?,?> r, Object msg) {