You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/03/31 17:14:03 UTC

svn commit: r643022 - /incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java

Author: antelder
Date: Mon Mar 31 08:14:01 2008
New Revision: 643022

URL: http://svn.apache.org/viewvc?rev=643022&view=rev
Log:
host-webapp part of the fix for TUSCANY-1974

Modified:
    incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java

Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java?rev=643022&r1=643021&r2=643022&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java (original)
+++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java Mon Mar 31 08:14:01 2008
@@ -185,10 +185,11 @@
             if (servletPath.endsWith("*")) {
                 servletPath = servletPath.substring(0, servletPath.length() - 1);
                 if (suri.startsWith(servletPath)) {
-                    return new WebAppRequestDispatcher(entry.getKey(), entry.getValue());
+                    // entry key is contextPath/servletPath, WebAppRequestDispatcher only wants servletPath
+                    return new WebAppRequestDispatcher(entry.getKey().substring(contextPath.length()), entry.getValue());
                 } else {
                     if ((suri + "/").startsWith(servletPath)) {
-                        return new WebAppRequestDispatcher(entry.getKey(), entry.getValue());
+                        return new WebAppRequestDispatcher(entry.getKey().substring(contextPath.length()), entry.getValue());
                     }
                 }
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org