From: Jani Laakso <jani.laakso@itmill.com>
Date: Wed, 5 Dec 2007 16:19:16 +0000 (+0000)
Subject: resources fix, did not work if context was set
X-Git-Tag: 6.7.0.beta1~5276
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6f764a57f24d211b2943e6818619d3d8f10f5475;p=vaadin-framework.git

resources fix, did not work if context was set

svn changeset:3179/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 647cc131f6..4fca722720 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -527,8 +527,9 @@ public class ApplicationServlet extends HttpServlet {
                     .split("\\/");
             widgetsetUrl = "";
             // if context is specified add it to widgetsetUrl
-            if (urlParts[3].equals(request.getContextPath())) {
-                widgetsetUrl += urlParts[3];
+            if (urlParts[3].equals(request.getContextPath().replaceAll("\\/",
+                    ""))) {
+                widgetsetUrl += "/" + urlParts[3];
             }
             for (int i = 3; i < urlParts.length; i++) {
                 appUrl += "/" + urlParts[i];