1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index da4dfa08dc..1308e7aac7 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -76,6 +76,10 @@ import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
  * Entry point classes (widgetsets) define <code>onModuleLoad()</code>.
  */
 public class ApplicationConnection {
+    private static final String CONNECTOR_PROTOCOL_PREFIX = "connector://";
+
+    public static final String CONNECTOR_RESOURCE_PREFIX = "APP/CONNECTOR";
+
     // This indicates the whole page is generated by us (not embedded)
     public static final String GENERATED_BODY_CLASSNAME = "v-generated-body";
 
@@ -2285,9 +2289,12 @@ public class ApplicationConnection {
         }
         if (uidlUri.startsWith("app://")) {
             uidlUri = getAppUri() + uidlUri.substring(6);
-        } else if (uidlUri.startsWith("connector://")) {
-            uidlUri = getAppUri() + "APP/CONNECTOR/"
-                    + uidlUri.substring("connector://".length());
+        } else if (uidlUri.startsWith(CONNECTOR_PROTOCOL_PREFIX)) {
+            // getAppUri *should* always end with /
+            // substring *should* always start with / (connector:///foo.bar
+            // without connector://)
+            uidlUri = getAppUri() + CONNECTOR_RESOURCE_PREFIX
+                    + uidlUri.substring(CONNECTOR_PROTOCOL_PREFIX.length());
         }
         return uidlUri;
     }