From a5a28c8401517430cdc7de90bb348e191f882561 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 12 Feb 2008 14:35:05 +0000
Subject: [PATCH] slashes and no contexts. fixes #1369

svn changeset:3784/svn branch:trunk
---
 .../terminal/gwt/client/ApplicationConnection.java       | 9 +++++++--
 .../toolkit/terminal/gwt/server/ApplicationServlet.java  | 5 +++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index e95ba8675a..36b44ff88c 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -76,7 +76,12 @@ public class ApplicationConnection {
 
     public ApplicationConnection(WidgetSet widgetSet) {
         this.widgetSet = widgetSet;
-        appUri = getAppUri();
+        String tmp = getAppUri();
+        if (!tmp.endsWith("/")) {
+            appUri = tmp + "/";
+        } else {
+            appUri = tmp;
+        }
 
         if (isDebugMode()) {
             console = new DebugConsole(this);
@@ -197,7 +202,7 @@ public class ApplicationConnection {
         showLoadingIndicator();
 
         console.log("Making UIDL Request with params: " + requestData);
-        final String uri = appUri + "/UIDL" + getPathInfo();
+        final String uri = appUri + "UIDL" + getPathInfo();
         final RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, uri);
         rb.setHeader("Content-Type",
                 "application/x-www-form-urlencoded; charset=utf-8");
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index e0771ee98b..57cdabdbb6 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -603,8 +603,9 @@ public class ApplicationServlet extends HttpServlet {
                 appUrl = "";
                 widgetsetUrl = "";
                 // if context is specified add it to widgetsetUrl
-                if (urlParts[3].equals(request.getContextPath().replaceAll(
-                        "\\/", ""))) {
+                if (urlParts.length > 3
+                        && urlParts[3].equals(request.getContextPath()
+                                .replaceAll("\\/", ""))) {
                     widgetsetUrl += "/" + urlParts[3];
                 }
                 for (int i = 3; i < urlParts.length; i++) {
-- 
2.39.5