markt 2004/04/24 08:12:00
Modified: catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
- Fix bug19801. Request dispatcher does not set empty javax.servlet.include request
attributes
on nested includes. Based on a patch suggested by Matthias Ernst
- Ported from TC4.
Revision Changes Path
1.32 +11 -15
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ApplicationDispatcher.java 5 Mar 2004 23:52:55 -0000 1.31
+++ ApplicationDispatcher.java 24 Apr 2004 15:12:00 -0000 1.32
@@ -565,21 +565,17 @@
sb.append(pathInfo);
if (sb.length() > 0)
*/
- 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);
+
+ 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 (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]
