Merge changes from origin/7.1

d8b0b50 Always unlock the same session instance that was locked (#12481)
e6af0f0 Avoid leaking memory from inherited ThreadLocales. Fixes #12401
f7ee8fb Updated _trackMessageSize based on latest upstream version (#12468)
a24d391 Table ignores Container updates while painting (#12258)
7068d78 The colon in the calendar event caption is now also hideable. Fixes #12460
61dd8f7 Corrected typo in version variable (#12440)
476e0b8 Changed 'feature release' text to maintenance release (#12486)
faa2569 Updated browser versions
831747a Fix regression where empty RTA returns <br> (#12490)
cb8df75 Add deprecation message to unused constant
4c5bb0e Sets the locale in the test case. #12460
11cdf93 Excludes WeakValueMap from the serializable test #12401

Change-Id: Id7eeba06d14518c254ceb01e38e2441967932755

3 files changed, 36 insertions, 33 deletions

diff --git a/WebContent/VAADIN/jquery.atmosphere.js b/WebContent/VAADIN/jquery.atmosphere.js
index b6f86d428a..520e63d7cb 100644
--- a/WebContent/VAADIN/jquery.atmosphere.js
+++ b/WebContent/VAADIN/jquery.atmosphere.js
@@ -1199,6 +1199,9 @@ jQuery.atmosphere = function() {
              * @param response
              */
             function _trackMessageSize(message, request, response) {
+                if (message.length === 0)
+                    return true;
+
                 if (request.trackMessageLength) {
 
                     // If we have found partial message, prepend them.
@@ -1207,36 +1210,29 @@ jQuery.atmosphere = function() {
                     }
 
                     var messages = [];
-                    var messageLength = 0;
                     var messageStart = message.indexOf(request.messageDelimiter);
-                    while (messageStart != -1) {
-                        messageLength = jQuery.trim(message.substring(messageLength, messageStart));
-                        message = message.substring(messageStart + request.messageDelimiter.length, message.length);
-
-                        // Stop search if there is not enough characters remaining (wait for next part to arrive)
-                        if (message.length == 0 || message.length < messageLength) break;
-
-                        // Find start of a possibly existing subsequent message from the remaining data
-                        messageStart = message.substring(messageLength).indexOf(request.messageDelimiter);
-                        
-                        // Store the completely received message 
-                        messages.push(message.substring(0, messageLength));
-                    }
-
-                    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);
+                    while (messageStart !== -1) {
+                        var str = jQuery.trim(message.substring(0, messageStart));
+                        var messageLength = parseInt(str, 10);
+                        if (isNaN(messageLength))
+                            throw 'message length "' + str + '" is not a number';
+                        messageStart += request.messageDelimiter.length;
+                        if (messageStart + messageLength > message.length) {
+                            // message not complete, so there is no trailing messageDelimiter
+                            messageStart = -1;
                         } else {
-                            response.partialMessage = messageLength + request.messageDelimiter + message ;
+                            // message complete, so add it
+                            messages.push(message.substring(messageStart, messageStart + messageLength));
+                            // remove consumed characters
+                            message = message.substring(messageStart + messageLength, message.length);
+                            messageStart = message.indexOf(request.messageDelimiter);
                         }
-                    } else {
-                        response.partialMessage = "";
                     }
 
-                    if (messages.length != 0) {
+                    /* keep any remaining data */
+                    response.partialMessage = message;
+
+                    if (messages.length !== 0) {
                         response.responseBody = messages.join(request.messageDelimiter);
                         response.messages = messages;
                         return false;
diff --git a/WebContent/VAADIN/themes/tests-calendar/styles.css b/WebContent/VAADIN/themes/tests-calendar/styles.css
index 7a37fcfdaf..e3fa107751 100644
--- a/WebContent/VAADIN/themes/tests-calendar/styles.css
+++ b/WebContent/VAADIN/themes/tests-calendar/styles.css
@@ -93,4 +93,12 @@
 .v-calendar .v-calendar-event-color4 .v-calendar-event-content {
 	border-color: #cd6a00;
 	background-color: #faa345;
-	}
\ No newline at end of file
+	}
+
+/**
+ * Hide time in captions
+ */
+.v-calendar-event-hide-time .v-calendar-event-caption>span,
+.v-calendar-event-hide-time .v-calendar-event-caption>br {
+    display: none;
+}
\ No newline at end of file
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index f3ec68e41f..387a5121cb 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -63,10 +63,9 @@
         <h2 id="overview">Overview of Vaadin @version@ Release</h2>
 
         <p>
-            Vaadin @version@ is a feature release that includes a number
-            of enhancements as well as important bug fixes, as listed in
-            the <a href="#changelog">change log</a> below. You can also
-            view the <a
+            Vaadin @version@ is a maintenance release that includes a number
+            of important bug fixes, as listed in the <a href="#changelog">change
+            log</a> below. You can also view the <a
                 href="http://dev.vaadin.com/query?status=closed&resolution=fixed&milestone=Vaadin+@version@&order=priority">list
                 of the closed issues</a> at the Vaadin developer's site.
         </p>
@@ -140,7 +139,7 @@
             <li><b>TableQuery</b> now supports schemas and catalogs</li>
         </ul>
 
-        <p>Tools have been updated for Vaadin @vaadin-minor@ with
+        <p>Tools have been updated for Vaadin @version-minor@ with
             the following changes:</p>
 
         <ul>
@@ -574,12 +573,12 @@
         </p>
 
         <ul>
-            <li>Mozilla Firefox 18-21</li>
+            <li>Mozilla Firefox 18-23</li>
             <li>Mozilla Firefox 17 ESR</li>
             <li>Internet Explorer 8-10</li>
             <li>Safari 6</li>
             <li>Opera 12</li>
-            <li>Google Chrome 23-27</li>
+            <li>Google Chrome 23-29</li>
         </ul>
 
         <p>