remm 2004/06/07 10:32:15
Modified: catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
- Remove some dead code.
- Also wrap when doing named forwards (otherwise session handling will be bad).
Revision Changes Path
1.34 +12 -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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ApplicationDispatcher.java 24 Apr 2004 16:01:19 -0000 1.33
+++ ApplicationDispatcher.java 7 Jun 2004 17:32:15 -0000 1.34
@@ -359,8 +359,19 @@
if ( log.isDebugEnabled() )
log.debug(" Named Dispatcher Forward");
+ ApplicationHttpRequest wrequest =
+ (ApplicationHttpRequest) wrapRequest();
+ wrequest.setRequestURI(hrequest.getRequestURI());
+ wrequest.setContextPath(hrequest.getContextPath());
+ wrequest.setServletPath(hrequest.getServletPath());
+ wrequest.setPathInfo(hrequest.getPathInfo());
+ wrequest.setQueryString(hrequest.getQueryString());
+
processRequest(request,response);
+ wrequest.recycle();
+ unwrapRequest();
+
}
// Handle an HTTP path-based forward
@@ -555,16 +566,6 @@
ApplicationHttpRequest wrequest =
(ApplicationHttpRequest) wrapRequest();
String contextPath = context.getPath();
- /*
- StringBuffer sb = new StringBuffer();
- if (contextPath != null)
- sb.append(contextPath);
- if (servletPath != null)
- sb.append(servletPath);
- if (pathInfo != null)
- sb.append(pathInfo);
- if (sb.length() > 0)
- */
if (requestURI != null)
wrequest.setAttribute(Globals.INCLUDE_REQUEST_URI_ATTR,
requestURI);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
