billbarker 2005/06/08 22:50:27 Modified: catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java Log: Set the path elements after setting the Request attributes. The 'hrequest' wraps the 'wrequest' in most (non-trivial, where it doesn't matter) cases, so if the Wrapper doesn't override the path-element methods, previously we got the wrong attribute values. If the Wrapper does override the path-element methods, than this is no more broken than before. Fix for Bug #35270. Revision Changes Path 1.44 +5 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java Index: ApplicationDispatcher.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- ApplicationDispatcher.java 6 Feb 2005 10:39:32 -0000 1.43 +++ ApplicationDispatcher.java 9 Jun 2005 05:50:26 -0000 1.44 @@ -372,10 +372,6 @@ ApplicationHttpRequest wrequest = (ApplicationHttpRequest) wrapRequest(); String contextPath = context.getPath(); - wrequest.setContextPath(contextPath); - wrequest.setRequestURI(requestURI); - wrequest.setServletPath(servletPath); - wrequest.setPathInfo(pathInfo); if (hrequest.getAttribute(Globals.FORWARD_REQUEST_URI_ATTR) == null) { wrequest.setAttribute(Globals.FORWARD_REQUEST_URI_ATTR, @@ -390,6 +386,10 @@ hrequest.getQueryString()); } + wrequest.setContextPath(contextPath); + wrequest.setRequestURI(requestURI); + wrequest.setServletPath(servletPath); + wrequest.setPathInfo(pathInfo); if (queryString != null) { wrequest.setQueryString(queryString); wrequest.setQueryParams(queryString);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]