Adds support for defining the URL to use for push requests (#18989)

Change-Id: I12afaf7e5c5c385f3a19c7dab60f044d8721e082

1 files changed, 12 insertions, 4 deletions

diff --git a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
index 8276bf68bb..158638a5ec 100644
--- a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
+++ b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
@@ -130,6 +130,11 @@ public class AtmospherePushConnection implements PushConnection {
      */
     private Command pendingDisconnectCommand;
 
+    /**
+     * The url to use for push requests
+     */
+    private String url;
+
     public AtmospherePushConnection() {
     }
 
@@ -173,7 +178,12 @@ public class AtmospherePushConnection implements PushConnection {
             config.setStringValue(param,
                     pushConfiguration.parameters.get(param));
         }
-
+        if (pushConfiguration.pushUrl != null) {
+            url = pushConfiguration.pushUrl;
+        } else {
+            url = ApplicationConstants.APP_PROTOCOL_PREFIX
+                    + ApplicationConstants.PUSH_PATH;
+        }
         runWhenAtmosphereLoaded(new Command() {
             @Override
             public void execute() {
@@ -188,9 +198,7 @@ public class AtmospherePushConnection implements PushConnection {
     }
 
     private void connect() {
-        String baseUrl = connection
-                .translateVaadinUri(ApplicationConstants.APP_PROTOCOL_PREFIX
-                        + ApplicationConstants.PUSH_PATH);
+        String baseUrl = connection.translateVaadinUri(url);
         String extraParams = UIConstants.UI_ID_PARAMETER + "="
                 + connection.getConfiguration().getUIId();