commit e9d93c12407e85c252e7b5c88753842e3f00adff
author bobv@google.com <bobv@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Mon Jan 25 16:22:37 2010 +0000
committer bobv@google.com <bobv@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Mon Jan 25 16:22:37 2010 +0000
tree 45ec07a76c9b308ade8493258857b99ae5491a02
parent 4def1d7ebe5007e1d1d8117fa243c30ab4953d39

Fix issue 4444 by removing the request's context path when computing module-relative paths.
Patch by: Richard Zschech
Review by: bobv


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@7459 8db76d5a-ed1c-0410-87a9-c151d255dfc7

user/src/com/google/gwt/rpc/server/RpcServlet.java

diff --git a/user/src/com/google/gwt/rpc/server/RpcServlet.java b/user/src/com/google/gwt/rpc/server/RpcServlet.java
index 54f6205..04ce002 100644
--- a/user/src/com/google/gwt/rpc/server/RpcServlet.java
+++ b/user/src/com/google/gwt/rpc/server/RpcServlet.java
@@ -271,7 +271,12 @@
       if (header == null) {
         return null;
       }
-      return new URL(header).getPath();
+      String path = new URL(header).getPath();
+      String contextPath = getThreadLocalRequest().getContextPath();
+      if (!path.startsWith(contextPath)) {
+        return null;
+      }
+      return path.substring(contextPath.length());
     } catch (MalformedURLException e) {
       return null;
     }