markt 2004/04/24 08:10:26
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
- Removed unused imports identified by Eclipse.
Revision Changes Path
1.31 +12 -22
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ApplicationDispatcher.java 9 Jun 2002 05:45:04 -0000 1.30
+++ ApplicationDispatcher.java 24 Apr 2004 15:10:26 -0000 1.31
@@ -78,11 +78,8 @@
import javax.servlet.ServletResponse;
import javax.servlet.ServletResponseWrapper;
import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.HttpRequest;
@@ -320,7 +317,7 @@
*/
public String getInfo() {
- return (this.info);
+ return (info);
}
@@ -554,21 +551,14 @@
sb.append(servletPath);
if (pathInfo != null)
sb.append(pathInfo);
- if (sb.length() > 0)
- wrequest.setAttribute(Globals.REQUEST_URI_ATTR,
- sb.toString());
- if (contextPath != null)
- wrequest.setAttribute(Globals.CONTEXT_PATH_ATTR,
- contextPath);
- if (servletPath != null)
- wrequest.setAttribute(Globals.SERVLET_PATH_ATTR,
- servletPath);
- if (pathInfo != null)
- wrequest.setAttribute(Globals.PATH_INFO_ATTR,
- pathInfo);
+
+ wrequest.setAttribute(Globals.REQUEST_URI_ATTR, sb.toString());
+ wrequest.setAttribute(Globals.CONTEXT_PATH_ATTR, contextPath);
+ wrequest.setAttribute(Globals.SERVLET_PATH_ATTR, servletPath);
+ wrequest.setAttribute(Globals.PATH_INFO_ATTR, pathInfo);
+ wrequest.setAttribute(Globals.QUERY_STRING_ATTR, queryString);
+
if (queryString != null) {
- wrequest.setAttribute(Globals.QUERY_STRING_ATTR,
- queryString);
wrequest.mergeParameters(queryString);
}
// invoke(wrequest, wresponse);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
