aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-04-04 14:56:14 +0300
committerVaadin Code Review <review@vaadin.com>2014-04-04 13:10:31 +0000
commitba1e86acd447ca857d2c6ce68b1fcc9215fd61b7 (patch)
treebcafeb4de4c3ab1e3d8a703b2922422f28405de2
parent752249d52d1fdda3f3ff36323ddf0a10ee8ee108 (diff)
downloadvaadin-framework-ba1e86acd447ca857d2c6ce68b1fcc9215fd61b7.tar.gz
vaadin-framework-ba1e86acd447ca857d2c6ce68b1fcc9215fd61b7.zip
Change push default fallback to long polling (#13409)
Change-Id: Ie9f4ea98a6bf4a4ec45118a46e58d15d9fe3b36f
-rw-r--r--client/src/com/vaadin/client/communication/AtmospherePushConnection.java2
-rw-r--r--shared/src/com/vaadin/shared/ui/ui/UIState.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
index 7e37f6be88..f0e3eb5b48 100644
--- a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
+++ b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
@@ -444,7 +444,7 @@ public class AtmospherePushConnection implements PushConnection {
return {
transport: 'websocket',
maxStreamingLength: 1000000,
- fallbackTransport: 'streaming',
+ fallbackTransport: 'long-polling',
contentType: 'application/json; charset=UTF-8',
reconnectInterval: 5000,
timeout: -1,
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java
index 339d671531..d2e6f037e9 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIState.java
+++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java
@@ -76,7 +76,7 @@ public class UIState extends TabIndexState {
parameters
.put(TRANSPORT_PARAM, Transport.WEBSOCKET.getIdentifier());
parameters.put(FALLBACK_TRANSPORT_PARAM,
- Transport.STREAMING.getIdentifier());
+ Transport.LONG_POLLING.getIdentifier());
}
}