Upgrade to atmosphere-runtime 2.0.3.vaadin1 (#12601)

Change-Id: Ic2e9543266b449e29fb8e52715559d3fbf249d93

diff --git a/push/build.xml b/push/build.xml
index abeec2a8b0b60e64f280490c2aa2efd689744cdd..0db99e815c04573dfd88068c4f9a4de1927c1bd8 100644 (file)
--- a/push/build.xml
+++ b/push/build.xml
@@ -16,7 +16,7 @@
     <property name="vaadinPush.debug.js" location="${result.dir}/js/VAADIN/vaadinPush.debug.js" />
 
     <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java -->
-    <property name="atmosphere.runtime.version" value="1.0.18.vaadin1" />
+    <property name="atmosphere.runtime.version" value="2.0.3.vaadin1" />
     <property name="jquery.version" value="1.9.0" />
 
     <path id="classpath.compile.custom" />

diff --git a/push/ivy.xml b/push/ivy.xml
index 2be47512feeb2eaaf4038f4c6ebc3731ca4e3d5d..fd9284b782204d524829b0f6c98e171778dd4496 100644 (file)
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE ivy-module [
 <!-- Keep the version number in sync with build.xml -->
-    <!ENTITY atmosphere.runtime.version "1.0.18.vaadin1">
+    <!ENTITY atmosphere.runtime.version "2.0.3.vaadin1">
     
     <!ENTITY atmosphere.js.version "2.0.3.vaadin2">
 ]>

diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index b0841da314852adbd1a67e446de765859e5a3dad..a39c39fa72be4590d0677eba94c48a5a0694f6f1 100644 (file)
--- a/server/src/com/vaadin/server/Constants.java
+++ b/server/src/com/vaadin/server/Constants.java
@@ -67,7 +67,7 @@ public interface Constants {
 
     // Keep the version number in sync with push/build.xml and other locations
     // listed in that file
-    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "1.0.18.vaadin1";
+    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.0.3.vaadin1";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"

diff --git a/server/src/com/vaadin/server/communication/AtmospherePushConnection.java b/server/src/com/vaadin/server/communication/AtmospherePushConnection.java
index b9d4955b121f1a47c8920799c72c6daa37a5ae70..6a515abc295f937e11eadbe4ff1ad8195a96ed1f 100644 (file)
--- a/server/src/com/vaadin/server/communication/AtmospherePushConnection.java
+++ b/server/src/com/vaadin/server/communication/AtmospherePushConnection.java
@@ -94,7 +94,7 @@ public class AtmospherePushConnection implements PushConnection {
 
     private UI ui;
     private AtmosphereResource resource;
-    private Future<String> outgoingMessage;
+    private Future<Object> outgoingMessage;
     private FragmentedMessage incomingMessage;
 
     public AtmospherePushConnection(UI ui, AtmosphereResource resource) {

diff --git a/server/src/com/vaadin/server/communication/PushHandler.java b/server/src/com/vaadin/server/communication/PushHandler.java
index 09428e47a95c71f45597ce657baa2624685e8ad7..eaa0de60270529508a81026db0beae7b37872f3b 100644 (file)
--- a/server/src/com/vaadin/server/communication/PushHandler.java
+++ b/server/src/com/vaadin/server/communication/PushHandler.java
@@ -19,7 +19,6 @@ package com.vaadin.server.communication;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
-import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -43,7 +42,6 @@ import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinServletRequest;
 import com.vaadin.server.VaadinServletService;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.server.WebBrowser;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.communication.PushMode;
 import com.vaadin.ui.UI;
@@ -84,14 +82,6 @@ public class PushHandler extends AtmosphereResourceEventListenerAdapter
 
             VaadinSession session = ui.getSession();
             if (resource.transport() == TRANSPORT.STREAMING) {
-                // IE8 requires a longer padding to work properly if the
-                // initial message is small (#11573). Chrome does not work
-                // without the original padding...
-                WebBrowser browser = session.getBrowser();
-                if (browser.isIE() && browser.getBrowserMajorVersion() == 8) {
-                    resource.padding(LONG_PADDING);
-                }
-
                 // Must ensure that the streaming response contains
                 // "Connection: close", otherwise iOS 6 will wait for the
                 // response to this request before sending another request to
@@ -214,14 +204,6 @@ public class PushHandler extends AtmosphereResourceEventListenerAdapter
         }
     };
 
-    private static final String LONG_PADDING;
-
-    static {
-        char[] array = new char[4096];
-        Arrays.fill(array, '-');
-        LONG_PADDING = String.copyValueOf(array);
-
-    }
     private VaadinServletService service;
 
     public PushHandler(VaadinServletService service) {