summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2014-01-10 18:16:58 +0200
committerVaadin Code Review <review@vaadin.com>2014-01-13 19:55:24 +0000
commitdd92ba5301f9db0b4139adcab6f667b26cd89b6d (patch)
tree69019b4ded48d474b3688b96d69e8c151876ad88
parent0e7ac388039cf8140f37df9d83cf62b9efc95bb8 (diff)
downloadvaadin-framework-dd92ba5301f9db0b4139adcab6f667b26cd89b6d.tar.gz
vaadin-framework-dd92ba5301f9db0b4139adcab6f667b26cd89b6d.zip
Upgrade to atmosphere-runtime 2.0.3.vaadin1 (#12601)
Change-Id: Ic2e9543266b449e29fb8e52715559d3fbf249d93
-rw-r--r--push/build.xml2
-rw-r--r--push/ivy.xml2
-rw-r--r--server/src/com/vaadin/server/Constants.java2
-rw-r--r--server/src/com/vaadin/server/communication/AtmospherePushConnection.java2
-rw-r--r--server/src/com/vaadin/server/communication/PushHandler.java18
5 files changed, 4 insertions, 22 deletions
diff --git a/push/build.xml b/push/build.xml
index abeec2a8b0..0db99e815c 100644
--- 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 2be47512fe..fd9284b782 100644
--- 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 b0841da314..a39c39fa72 100644
--- 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 b9d4955b12..6a515abc29 100644
--- 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 09428e47a9..eaa0de6027 100644
--- 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) {