markt 2004/04/24 09:01:19
Modified: catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
Revert port of patch for bug 19801. This bug is not present in TC5 and the patch has
no positive effects.
Revision Changes Path
1.33 +15 -11
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ApplicationDispatcher.java 24 Apr 2004 15:12:00 -0000 1.32
+++ ApplicationDispatcher.java 24 Apr 2004 16:01:19 -0000 1.33
@@ -565,17 +565,21 @@
sb.append(pathInfo);
if (sb.length() > 0)
*/
-
- wrequest.setAttribute(Globals.INCLUDE_REQUEST_URI_ATTR, requestURI);
- wrequest.setAttribute(Globals.INCLUDE_CONTEXT_PATH_ATTR,
- contextPath);
- wrequest.setAttribute(Globals.INCLUDE_SERVLET_PATH_ATTR,
- servletPath);
- wrequest.setAttribute(Globals.INCLUDE_PATH_INFO_ATTR, pathInfo);
- wrequest.setAttribute(Globals.INCLUDE_QUERY_STRING_ATTR,
- queryString);
-
+ if (requestURI != null)
+ wrequest.setAttribute(Globals.INCLUDE_REQUEST_URI_ATTR,
+ requestURI);
+ if (contextPath != null)
+ wrequest.setAttribute(Globals.INCLUDE_CONTEXT_PATH_ATTR,
+ contextPath);
+ if (servletPath != null)
+ wrequest.setAttribute(Globals.INCLUDE_SERVLET_PATH_ATTR,
+ servletPath);
+ if (pathInfo != null)
+ wrequest.setAttribute(Globals.INCLUDE_PATH_INFO_ATTR,
+ pathInfo);
if (queryString != null) {
+ wrequest.setAttribute(Globals.INCLUDE_QUERY_STRING_ATTR,
+ queryString);
wrequest.setQueryParams(queryString);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
