From 9aafe4d1c535e9f79c09f33d2e1a1f8cc344eaa0 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 31 Aug 2015 11:43:31 +0300 Subject: Use Transport.WEBSOCKET_XHR instead of setter for mixing websockets and XHR (#11733) Change-Id: I2fad7d367d8a4ba476ae0705672ebc2ee7cfeb1c --- uitest/src/com/vaadin/tests/components/AbstractTestUI.java | 3 +-- uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'uitest') diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java index 296e68008e..33ff504d8d 100644 --- a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java +++ b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java @@ -125,8 +125,7 @@ public abstract class AbstractTestUI extends UI { } else if ("websocket".equals(transport)) { enablePush(Transport.WEBSOCKET); } else if ("websocket-xhr".equals(transport)) { - enablePush(Transport.WEBSOCKET); - getPushConfiguration().setAlwaysUseXhrForServerRequests(true); + enablePush(Transport.WEBSOCKET_XHR); } else if ("streaming".equals(transport)) { enablePush(Transport.STREAMING); } else if ("long-polling".equals(transport)) { diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java index 4f0769e3d7..e31eb2a369 100644 --- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java +++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java @@ -20,7 +20,7 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.ui.Transport; import com.vaadin.shared.ui.ui.UIState.PushConfigurationState; -@Push(transport = Transport.WEBSOCKET) +@Push(transport = Transport.WEBSOCKET_XHR) public class BasicPushWebsocketXhr extends BasicPush { @Override @@ -29,7 +29,6 @@ public class BasicPushWebsocketXhr extends BasicPush { // Don't use fallback so we can easier detect if websocket fails getPushConfiguration().setParameter( PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none"); - getPushConfiguration().setAlwaysUseXhrForServerRequests(true); } } -- cgit v1.2.3