Merge changes from origin/7.1

7cb49d1 Fix invisible calendar actions menu #12181
44aacf4 Clarify Embedded javadoc (#12290)
59a043b Fix actions in action menu appearing in random order #12250
5d57129 Fix calendar click events on context menu #12297
f5e3663 Document multiple load semantics in @StyleSheet and @JavaScript (#12200)
17bb700 Add optional OSGi Import-Package for javax.validation (#12301)
ea148c8 Disable all logging if production mode is enabled (#12299)
326bbb5 Fixes parsing of multiple push messages in streaming mode (#12197)
7fc1054 Ensure StringToIntegerConverter rejects values outside range of int (#12230)
f587298 Improve URI fragment listener javadocs (#12296)
d97cfbc Refine handling of null and empty URI fragments (#12207)
99c7d0b Show tooltips for ordered layout captions (#10046)

Change-Id: Ifb2e0131fde769e2620b7ba03755a5ba324d8aaf

1 files changed, 9 insertions, 2 deletions

diff --git a/WebContent/VAADIN/jquery.atmosphere.js b/WebContent/VAADIN/jquery.atmosphere.js
index 28a7d033bd..b2dd99f5d2 100644
--- a/WebContent/VAADIN/jquery.atmosphere.js
+++ b/WebContent/VAADIN/jquery.atmosphere.js
@@ -1219,8 +1219,15 @@ jQuery.atmosphere = function() {
                         messages.push(message.substring(0, messageLength));
                     }
 
-                    if (messages.length == 0 || (messageStart != -1 && message.length != 0 && messageLength != message.length)){
-                        response.partialMessage = messageLength + request.messageDelimiter + message ;
+                    if (messages.length == 0 || (message.length != 0 && messageLength != message.length)){
+                        if (messageStart == -1) {
+                            // http://dev.vaadin.com/ticket/12197
+                            // partialMessage must contain length header of next message
+                            // it starts at the end of the last message
+                            response.partialMessage = message.substring(messageLength);
+                        } else {
+                            response.partialMessage = messageLength + request.messageDelimiter + message ;
+                        }
                     } else {
                         response.partialMessage = "";
                     }