summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ApplicationConnection.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index d873cc8dc6..236417f23b 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -2940,6 +2940,14 @@ public class ApplicationConnection {
uidlUri = serviceUrl + relativeUrl;
}
}
+ if (uidlUri.startsWith(ApplicationConstants.VAADIN_PROTOCOL_PREFIX)) {
+ final String vaadinUri = configuration.getVaadinDirUrl();
+ String relativeUrl = uidlUri
+ .substring(ApplicationConstants.VAADIN_PROTOCOL_PREFIX
+ .length());
+ uidlUri = vaadinUri + relativeUrl;
+ }
+
return uidlUri;
}