From 140844eaff3de1b926460081405eb7d53ec811f8 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 19 Mar 2015 09:49:32 +0000
Subject: Revert "Make push path configurable (#14432)."

Breaks long polling fallback when implemented this way

This reverts commit 735f0748344d7ee594c4e52a715d867dfdb23cb1.

Conflicts:
	push/build.xml
	push/ivy.xml
	server/src/com/vaadin/server/Constants.java
	uitest/src/com/vaadin/tests/push/PushPathTest.java

Change-Id: I07f6fedafc648b0ee403865ccb322017d2a8d571
---
 .../client/communication/AtmospherePushConnection.java    | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'client/src')

diff --git a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
index 787da9bc6f..e544c91d0f 100644
--- a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
+++ b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
@@ -43,7 +43,7 @@ import elemental.json.JsonObject;
 /**
  * The default {@link PushConnection} implementation that uses Atmosphere for
  * handling the communication channel.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -135,8 +135,6 @@ public class AtmospherePushConnection implements PushConnection {
      */
     private Command pendingDisconnectCommand;
 
-    private String pushPath;
-
     public AtmospherePushConnection() {
     }
 
@@ -183,9 +181,6 @@ public class AtmospherePushConnection implements PushConnection {
                     pushConfiguration.parameters.get(param));
         }
 
-        pushPath = pushConfiguration.pushPath;
-        assert pushPath != null;
-
         runWhenAtmosphereLoaded(new Command() {
             @Override
             public void execute() {
@@ -202,7 +197,7 @@ public class AtmospherePushConnection implements PushConnection {
     private void connect() {
         String baseUrl = connection
                 .translateVaadinUri(ApplicationConstants.APP_PROTOCOL_PREFIX
-                        + pushPath + '/');
+                        + ApplicationConstants.PUSH_PATH + '/');
         String extraParams = UIConstants.UI_ID_PARAMETER + "="
                 + connection.getConfiguration().getUIId();
 
@@ -277,9 +272,9 @@ public class AtmospherePushConnection implements PushConnection {
     /**
      * Called whenever a server push connection is established (or
      * re-established).
-     * 
+     *
      * @param response
-     * 
+     *
      * @since 7.2
      */
     protected void onConnect(AtmosphereResponse response) {
@@ -360,7 +355,7 @@ public class AtmospherePushConnection implements PushConnection {
     /**
      * Called if the push connection fails. Atmosphere will automatically retry
      * the connection until successful.
-     * 
+     *
      */
     protected void onError(AtmosphereResponse response) {
         state = State.DISCONNECTED;
-- 
cgit v1.2.3