]> source.dussan.org Git - vaadin-framework.git/commitdiff
resources fix, did not work if context was set
authorJani Laakso <jani.laakso@itmill.com>
Wed, 5 Dec 2007 16:19:16 +0000 (16:19 +0000)
committerJani Laakso <jani.laakso@itmill.com>
Wed, 5 Dec 2007 16:19:16 +0000 (16:19 +0000)
svn changeset:3179/svn branch:trunk

src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java

index 647cc131f6406669ff447103bc28141bee7d98bc..4fca722720ffc73617745bc4d201dacc947ec56f 100644 (file)
@@ -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];