cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
billbarker2005/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 ChangesPath
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.java6 Feb 2005 10:39:32 - 1.43
+++ ApplicationDispatcher.java9 Jun 2005 05:50:26 - 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]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java StandardContext.java StandardWrapperValve.java StandardWrapper.java
remm2005/02/06 02:39:32
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java StandardContext.java
StandardWrapperValve.java StandardWrapper.java
Log:
- Improve a little logging of servlet exceptions, which should all log the
root cause.
- Add a utility method in StandardWrapper.
- Don't log client aborts in the request dispatcher.
Revision ChangesPath
1.43 +7 -21
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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ApplicationDispatcher.java11 Jan 2005 14:01:45 - 1.42
+++ ApplicationDispatcher.java6 Feb 2005 10:39:32 - 1.43
@@ -48,7 +48,6 @@
import org.apache.catalina.util.StringManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.tomcat.util.IntrospectionUtils;
/**
* Standard implementation of codeRequestDispatcher/code that allows a
@@ -643,7 +642,7 @@
}
} catch (ServletException e) {
wrapper.getLogger().error(sm.getString(applicationDispatcher.allocateException,
- wrapper.getName()), e);
+ wrapper.getName()),
StandardWrapper.getRootCause(e));
servletException = e;
servlet = null;
} catch (Throwable e) {
@@ -700,24 +699,11 @@
request.removeAttribute(Globals.JSP_FILE_ATTR);
support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
servlet, request, response);
-Throwable rootCause = e;
-Throwable rootCauseCheck = null;
-
-// Extra aggressive rootCause finding
-do {
-try {
-rootCauseCheck =
(Throwable)IntrospectionUtils.getProperty
-(rootCause, rootCause);
-if (rootCauseCheck!=null)
-rootCause = rootCauseCheck;
-
-} catch (ClassCastException ex) {
-rootCauseCheck = null;
-}
-} while (rootCauseCheck != null);
-
-
wrapper.getLogger().error(sm.getString(applicationDispatcher.serviceException,
- wrapper.getName()), rootCause);
+Throwable rootCause = StandardWrapper.getRootCause(e);
+if (!(rootCause instanceof ClientAbortException)) {
+
wrapper.getLogger().error(sm.getString(applicationDispatcher.serviceException,
+wrapper.getName()), rootCause);
+}
servletException = e;
} catch (RuntimeException e) {
request.removeAttribute(Globals.JSP_FILE_ATTR);
1.161 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- StandardContext.java 4 Feb 2005 23:39:58 - 1.160
+++ StandardContext.java 6 Feb 2005 10:39:32 - 1.161
@@ -3846,7 +3846,7 @@
} catch (ServletException e) {
getServletContext().log
(sm.getString(standardWrapper.loadException,
- getName()), e);
+ getName()),
StandardWrapper.getRootCause(e));
// NOTE: load errors (including a servlet that throws
// UnavailableException from tht init() method) are NOT
// fatal to application startup
1.33 +3 -19
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- StandardWrapperValve.java 13 Jul 2004 09:43:59 - 1.32
+++ StandardWrapperValve.java 6 Feb 2005 10:39:32 - 1.33
@@ -36,7 +36,6 @@
import
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java StandardHost.java
remm2005/01/11 06:01:45 Modified:catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java StandardHost.java Log: - Fix bad imports. Revision ChangesPath 1.42 +1 -2 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.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- ApplicationDispatcher.java22 Nov 2004 16:35:18 - 1.41 +++ ApplicationDispatcher.java11 Jan 2005 14:01:45 - 1.42 @@ -50,7 +50,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.tomcat.util.IntrospectionUtils; -import org.apache.catalina.security.SecurityUtil; /** * Standard implementation of codeRequestDispatcher/code that allows a * request to be forwarded to a different resource to create the ultimate 1.38 +1 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java Index: StandardHost.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- StandardHost.java 27 Dec 2004 09:43:14 - 1.37 +++ StandardHost.java 11 Jan 2005 14:01:45 - 1.38 @@ -25,7 +25,6 @@ import org.apache.catalina.Context; import org.apache.catalina.Host; import org.apache.catalina.LifecycleException; -import org.apache.catalina.Realm; import org.apache.catalina.Valve; import org.apache.catalina.startup.HostConfig; import org.apache.catalina.valves.ValveBase; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
remm2004/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 ChangesPath 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.java24 Apr 2004 16:01:19 - 1.33 +++ ApplicationDispatcher.java7 Jun 2004 17:32:15 - 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]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
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 ChangesPath
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.java5 Mar 2004 23:52:55 - 1.31
+++ ApplicationDispatcher.java24 Apr 2004 15:12:00 - 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]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
[EMAIL PROTECTED] wrote: 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. I have a bad feeling about this fix. Are you absolutely certain the issue was valid ? Also, setting the value as null seems bad to me. -1 for the change for the time being. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
Remy Maucherat wrote: [EMAIL PROTECTED] wrote: 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. I have a bad feeling about this fix. Are you absolutely certain the issue was valid ? Also, setting the value as null seems bad to me. -1 for the change for the time being. I reviewed the bug: I am convinced this was working fine with the current code (all the setAttribute with a null value end up not doing anything, as they are treated as special already - and there's no delegation for the include special attributes). Did you test it ? So -0 for the change, since it doesn't actually do anything except introducing useless operations. (for TC 4, the patch is very likely useful) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
From: Remy Maucherat [mailto:[EMAIL PROTECTED] [EMAIL PROTECTED] wrote: 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. I have a bad feeling about this fix. Are you absolutely certain the issue was valid ? Also, setting the value as null seems bad to me. I am sure that this is a bug. To quote from the spec (SRV.8.3.1) The 2.3 spec is not as explicit but I believe this is the right approach for TC4 and TC5. spec-quote ...These attributes are accessible from the included servlet via the getAttribute method on the request object and their values must be equal to the request URI, context path, servlet path, path info, and query string of the included servlet, respectively. If the request is subsequently included, these attributes are replaced for that include. ... /spec-quote The problem occurs with a nested sequence of includes as described in the original bug report: Servlet A, mapped at /A/* includes /B/should.not.see Servlet B, mapped at /B/* includes /C Servlet C, mapped at /C/* prints out request.getAttribute(javax.servlet.include.path_info) The output should be null (and is if you access /B) but if you access /A then should.not.see is returned. This can not be correct behaviour. Given the behaviour of requests for /B I am content with setting the value to null. -1 for the change for the time being. Is the above enough to change your mind on this? Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
-Original Message- From: Remy Maucherat [mailto:[EMAIL PROTECTED] Sent: Saturday, April 24, 2004 4:32 PM To: Tomcat Developers List Subject: Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina /core ApplicationDispatcher.java Remy Maucherat wrote: [EMAIL PROTECTED] wrote: 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. I have a bad feeling about this fix. Are you absolutely certain the issue was valid ? Also, setting the value as null seems bad to me. -1 for the change for the time being. I reviewed the bug: I am convinced this was working fine with the current code (all the setAttribute with a null value end up not doing anything, as they are treated as special already - and there's no delegation for the include special attributes). Did you test it ? So -0 for the change, since it doesn't actually do anything except introducing useless operations. (for TC 4, the patch is very likely useful) I tested it for TC4 and saw the issue. I must admit to just porting it to TC5 as the code looked to be identicial. I'll do some more testing with TC5 and revert the patch if it isn't actually doing anything. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
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 ChangesPath
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.java24 Apr 2004 15:12:00 - 1.32
+++ ApplicationDispatcher.java24 Apr 2004 16:01:19 - 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]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
Mark Thomas wrote: I tested it for TC4 and saw the issue. I must admit to just porting it to TC5 as the code looked to be identicial. I'll do some more testing with TC5 and revert the patch if it isn't actually doing anything. I rewrote a lot in the request dispatcher, so that its speed is now decent. In the process, a lot of bugs were fixed, including the rather complex nesting rules for all the special attributes. It seems ok now (noone reported a valid RD issue with 5.0.19), including all the cross context stuff (with the exception of the ServletContext.getContext method, since the spec has an issue). Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
remm2004/02/11 04:07:23
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
- The forward request attributes must reflect the original request. So only set them
if the request being passed doesn't have them.
Revision ChangesPath
1.29 +17 -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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ApplicationDispatcher.java26 Jan 2004 19:47:03 - 1.28
+++ ApplicationDispatcher.java11 Feb 2004 12:07:23 - 1.29
@@ -423,17 +423,19 @@
wrequest.setRequestURI(requestURI);
wrequest.setServletPath(servletPath);
wrequest.setPathInfo(pathInfo);
-
-wrequest.setAttribute(Globals.FORWARD_REQUEST_URI_ATTR,
- hrequest.getRequestURI());
-wrequest.setAttribute(Globals.FORWARD_CONTEXT_PATH_ATTR,
- hrequest.getContextPath());
-wrequest.setAttribute(Globals.FORWARD_SERVLET_PATH_ATTR,
- hrequest.getServletPath());
-wrequest.setAttribute(Globals.FORWARD_PATH_INFO_ATTR,
- hrequest.getPathInfo());
-wrequest.setAttribute(Globals.FORWARD_QUERY_STRING_ATTR,
- hrequest.getQueryString());
+
+if (hrequest.getAttribute(Globals.FORWARD_REQUEST_URI_ATTR) == null) {
+wrequest.setAttribute(Globals.FORWARD_REQUEST_URI_ATTR,
+ hrequest.getRequestURI());
+wrequest.setAttribute(Globals.FORWARD_CONTEXT_PATH_ATTR,
+ hrequest.getContextPath());
+wrequest.setAttribute(Globals.FORWARD_SERVLET_PATH_ATTR,
+ hrequest.getServletPath());
+wrequest.setAttribute(Globals.FORWARD_PATH_INFO_ATTR,
+ hrequest.getPathInfo());
+wrequest.setAttribute(Globals.FORWARD_QUERY_STRING_ATTR,
+ hrequest.getQueryString());
+}
if (queryString != null) {
wrequest.setQueryString(queryString);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java ApplicationHttpRequest.java StandardHostValve.java
remm2004/01/22 10:21:36
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
ApplicationHttpRequest.java StandardHostValve.java
Log:
- Improvements to session activity tracking, handling the case where the
session is new, as well as cross context.
- If this doesn't work, I give up ;)
Revision ChangesPath
1.27 +10 -4
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ApplicationDispatcher.java12 Sep 2003 17:04:12 - 1.26
+++ ApplicationDispatcher.java22 Jan 2004 18:21:36 - 1.27
@@ -441,6 +441,8 @@
}
processRequest(request,response);
+
+wrequest.recycle();
unwrapRequest();
}
@@ -582,6 +584,8 @@
new
Integer(ApplicationFilterFactory.INCLUDE));
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
invoke(outerRequest, outerResponse);
+
+wrequest.recycle();
unwrapRequest();
unwrapResponse();
@@ -628,6 +632,8 @@
new
Integer(ApplicationFilterFactory.INCLUDE));
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
invoke(outerRequest, outerResponse);
+
+wrequest.recycle();
unwrapRequest();
unwrapResponse();
1.15 +60 -60
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ApplicationHttpRequest.java 22 Dec 2003 09:28:50 - 1.14
+++ ApplicationHttpRequest.java 22 Jan 2004 18:21:36 - 1.15
@@ -232,7 +232,7 @@
/**
* The currently active session for this request.
*/
-protected HttpSession session = null;
+protected Session session = null;
/**
@@ -387,17 +387,16 @@
public String getParameter(String name) {
parseParameters();
-synchronized (parameters) {
-Object value = parameters.get(name);
-if (value == null)
-return (null);
-else if (value instanceof String[])
-return (((String[]) value)[0]);
-else if (value instanceof String)
-return ((String) value);
-else
-return (value.toString());
-}
+
+Object value = parameters.get(name);
+if (value == null)
+return (null);
+else if (value instanceof String[])
+return (((String[]) value)[0]);
+else if (value instanceof String)
+return ((String) value);
+else
+return (value.toString());
}
@@ -421,9 +420,7 @@
public Enumeration getParameterNames() {
parseParameters();
-synchronized (parameters) {
-return (new Enumerator(parameters.keySet()));
-}
+return (new Enumerator(parameters.keySet()));
}
@@ -437,21 +434,19 @@
public String[] getParameterValues(String name) {
parseParameters();
-synchronized (parameters) {
-Object value = parameters.get(name);
-if (value == null)
-return ((String[]) null);
-else if (value instanceof String[])
-return ((String[]) value);
-else if (value instanceof String) {
-String values[] = new String[1];
-values[0] = (String) value;
-return (values);
-} else {
-String values[] = new String[1];
-values[0] = value.toString();
-return (values);
-}
+Object value = parameters.get(name);
+if (value == null)
+return ((String[]) null);
+else if (value instanceof String[])
+return ((String[]) value);
+else if (value instanceof String) {
+String values[] = new String[1];
+
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
remm2003/09/12 10:04:12
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
- Remove overriding the mapped servlet path with the jsp-file. I cannot find
anything in the specification which says that it must be done, and it contradicts
all the other mapping rules. This code was introduced in Tomcat 4.0 b5 (yes,
I had to go back for a *while*).
- This fixes tester failures with the latest changes to JSP servlet.
Revision ChangesPath
1.26 +4 -13
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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ApplicationDispatcher.java2 Sep 2003 21:22:04 - 1.25
+++ ApplicationDispatcher.java12 Sep 2003 17:04:12 - 1.26
@@ -196,15 +196,6 @@
this.pathInfo + , queryString= + queryString +
, name= + this.name);
-// If this is a wrapper for a JSP page (jsp-file), tweak
-// the request parameters appropriately
-String jspFile = wrapper.getJspFile();
-if (jspFile != null) {
-if ( log.isDebugEnabled() )
-log.debug(--servletPath= + jspFile);
-this.servletPath = jspFile;
-}
-
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
remm2003/08/30 01:40:27
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
- The request dispatcher should also not log a client abort exception.
Revision ChangesPath
1.24 +10 -4
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ApplicationDispatcher.java7 Aug 2003 00:56:25 - 1.23
+++ ApplicationDispatcher.java30 Aug 2003 08:40:27 - 1.24
@@ -92,6 +92,7 @@
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.ClientAbortException;
import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.connector.ResponseFacade;
import org.apache.catalina.core.StandardWrapper;
@@ -755,6 +756,11 @@
request.removeAttribute(Globals.JSP_FILE_ATTR);
support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
servlet, request, response);
+} catch (ClientAbortException e) {
+request.removeAttribute(Globals.JSP_FILE_ATTR);
+support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
+ servlet, request, response);
+ioException = e;
} catch (IOException e) {
request.removeAttribute(Globals.JSP_FILE_ATTR);
support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
funkman 2003/08/06 17:56:25
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
Use PropertyUtils to aggressively get the real rootCause as previously
committed in StandardWrapperValve and ErrorReportValve
Revision ChangesPath
1.23 +26 -12
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ApplicationDispatcher.java5 Aug 2003 13:22:03 - 1.22
+++ ApplicationDispatcher.java7 Aug 2003 00:56:25 - 1.23
@@ -97,6 +97,7 @@
import org.apache.catalina.core.StandardWrapper;
import org.apache.catalina.util.InstanceSupport;
import org.apache.catalina.util.StringManager;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
@@ -630,7 +631,7 @@
if (queryString != null) {
wrequest.setAttribute(Globals.INCLUDE_QUERY_STRING_ATTR,
queryString);
- wrequest.setQueryParams(queryString);
+wrequest.setQueryParams(queryString);
}
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
@@ -774,14 +775,27 @@
support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
servlet, request, response);
Throwable rootCause = e;
-while (rootCause instanceof ServletException) {
-Throwable t = ((ServletException) rootCause).getRootCause();
-if (t != null) {
-rootCause = t;
-} else {
-break;
+Throwable rootCauseCheck = null;
+
+// Extra aggressive rootCause finding
+do {
+try {
+rootCauseCheck = (Throwable)PropertyUtils.getProperty
+(rootCause, rootCause);
+if (rootCauseCheck!=null)
+rootCause = rootCauseCheck;
+
+} catch (ClassCastException ex) {
+rootCauseCheck = null;
+} catch (IllegalAccessException ex) {
+rootCauseCheck = null;
+} catch (NoSuchMethodException ex) {
+rootCauseCheck = null;
+} catch (java.lang.reflect.InvocationTargetException ex) {
+rootCauseCheck = null;
}
-}
+} while (rootCauseCheck != null);
+
log(sm.getString(applicationDispatcher.serviceException,
wrapper.getName()), rootCause);
servletException = e;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
remm2003/07/23 00:51:33
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
- Forgot a few logging calls.
Revision ChangesPath
1.21 +2 -2
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ApplicationDispatcher.java22 Jul 2003 19:02:50 - 1.20
+++ ApplicationDispatcher.java23 Jul 2003 07:51:33 - 1.21
@@ -810,11 +810,11 @@
wrapper.deallocate(servlet);
}
} catch (ServletException e) {
-log.error(sm.getString(applicationDispatcher.deallocateException,
+log(sm.getString(applicationDispatcher.deallocateException,
wrapper.getName()), e);
servletException = e;
} catch (Throwable e) {
-log.error(sm.getString(applicationDispatcher.deallocateException,
+log(sm.getString(applicationDispatcher.deallocateException,
wrapper.getName()), e);
servletException = new ServletException
(sm.getString(applicationDispatcher.deallocateException,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
remm2003/07/22 12:02:51
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
- Similar to the other logging changes.
- Log the root cause.
Revision ChangesPath
1.20 +37 -32
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ApplicationDispatcher.java17 Jul 2003 11:56:40 - 1.19
+++ ApplicationDispatcher.java22 Jul 2003 19:02:50 - 1.20
@@ -694,7 +694,7 @@
// Check for the servlet being marked unavailable
if (wrapper.isUnavailable()) {
-log.error(sm.getString(applicationDispatcher.isUnavailable,
+log(sm.getString(applicationDispatcher.isUnavailable,
wrapper.getName()));
if (hresponse == null) {
; // NOTE - Not much we can do generically
@@ -720,12 +720,12 @@
//log(No servlet instance returned!);
}
} catch (ServletException e) {
-log.error(sm.getString(applicationDispatcher.allocateException,
+log(sm.getString(applicationDispatcher.allocateException,
wrapper.getName()), e);
servletException = e;
servlet = null;
} catch (Throwable e) {
-log.error(sm.getString(applicationDispatcher.allocateException,
+log(sm.getString(applicationDispatcher.allocateException,
wrapper.getName()), e);
servletException = new ServletException
(sm.getString(applicationDispatcher.allocateException,
@@ -758,14 +758,14 @@
request.removeAttribute(Globals.JSP_FILE_ATTR);
support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
servlet, request, response);
-log.error(sm.getString(applicationDispatcher.serviceException,
+log(sm.getString(applicationDispatcher.serviceException,
wrapper.getName()), e);
ioException = e;
} catch (UnavailableException e) {
request.removeAttribute(Globals.JSP_FILE_ATTR);
support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
servlet, request, response);
-log.error(sm.getString(applicationDispatcher.serviceException,
+log(sm.getString(applicationDispatcher.serviceException,
wrapper.getName()), e);
servletException = e;
wrapper.unavailable(e);
@@ -773,14 +773,23 @@
request.removeAttribute(Globals.JSP_FILE_ATTR);
support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
servlet, request, response);
-log.error(sm.getString(applicationDispatcher.serviceException,
- wrapper.getName()), e);
+Throwable rootCause = e;
+while (rootCause instanceof ServletException) {
+Throwable t = ((ServletException) rootCause).getRootCause();
+if (t != null) {
+rootCause = t;
+} else {
+break;
+}
+}
+log(sm.getString(applicationDispatcher.serviceException,
+ wrapper.getName()), rootCause);
servletException = e;
} catch (RuntimeException e) {
request.removeAttribute(Globals.JSP_FILE_ATTR);
support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
servlet, request, response);
-log.error(sm.getString(applicationDispatcher.serviceException,
+log(sm.getString(applicationDispatcher.serviceException,
wrapper.getName()), e);
runtimeException = e;
}
@@ -833,16 +842,13 @@
* @param message Message to be logged
*/
private void log(String message) {
-// XXX remove it.
-log.info( message);
-
-//Logger logger = context.getLogger();
-//if (logger != null)
-//logger.log(ApplicationDispatcher[ + context.getPath() +
-// ]: + message);
-//else
-//System.out.println(ApplicationDispatcher[ +
-//
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
remm2003/07/17 04:56:40
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
- Fix error page forwarding (bug 21341).
Revision ChangesPath
1.19 +19 -21
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ApplicationDispatcher.java10 Jun 2003 20:02:02 - 1.18
+++ ApplicationDispatcher.java17 Jul 2003 11:56:40 - 1.19
@@ -498,28 +498,26 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
*/
-private void processRequest(ServletRequest request, ServletResponse response)
-throws IOException, ServletException {
+private void processRequest(ServletRequest request,
+ServletResponse response)
+throws IOException, ServletException {
-if (request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR) !=
null){
-Integer disInt =
-(Integer)request.getAttribute(
-ApplicationFilterFactory.DISPATCHER_TYPE_ATTR);
-
+Integer disInt = (Integer) request.getAttribute
+(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR);
+if (disInt != null) {
if (disInt.intValue() != ApplicationFilterFactory.ERROR) {
-outerRequest.setAttribute(
-ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
-origServletPath);
-
-outerRequest.setAttribute(
-ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
-new Integer(ApplicationFilterFactory.FORWARD));
-
+outerRequest.setAttribute
+(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
+ origServletPath);
+outerRequest.setAttribute
+(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
+ new Integer(ApplicationFilterFactory.FORWARD));
invoke(outerRequest, response);
} else {
-invoke(request, response);
+invoke(outerRequest, response);
}
-}
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
remm2003/06/10 13:02:03 Modified:catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java Log: - Remove commented out code. Revision ChangesPath 1.18 +4 -13 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ApplicationDispatcher.java21 May 2003 17:49:03 - 1.17 +++ ApplicationDispatcher.java10 Jun 2003 20:02:02 - 1.18 @@ -428,15 +428,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); -*/ wrequest.setContextPath(contextPath); wrequest.setRequestURI(requestURI); wrequest.setServletPath(servletPath); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
jfarcand2003/04/04 14:51:18
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
Do not print the exception since it has been previously logged (and also that not
the proper exception)
Revision ChangesPath
1.13 +6 -6
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ApplicationDispatcher.java18 Mar 2003 16:23:36 - 1.12
+++ ApplicationDispatcher.java4 Apr 2003 22:51:18 - 1.13
@@ -13,7 +13,7 @@
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *5
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
@@ -520,7 +520,7 @@
AccessController.doPrivileged(dp);
} catch (PrivilegedActionException pe) {
Exception e = pe.getException();
-pe.printStackTrace();
+
if (e instanceof ServletException)
throw (ServletException) e;
throw (IOException) e;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
jfarcand2003/04/04 15:11:27 Modified:catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java Log: Remove magic number 5 :-) Revision ChangesPath 1.14 +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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ApplicationDispatcher.java4 Apr 2003 22:51:18 - 1.13 +++ ApplicationDispatcher.java4 Apr 2003 23:11:27 - 1.14 @@ -13,7 +13,7 @@ * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - *5 + * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
jfarcand2003/03/18 08:23:36
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
Properly set the value used to create filter chain under a
ApplicationDispatcher.forward
Fix for bug: 17783,17784,17785,17787
Revision ChangesPath
1.12 +19 -38
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApplicationDispatcher.java19 Feb 2003 20:05:33 - 1.11
+++ ApplicationDispatcher.java18 Mar 2003 16:23:36 - 1.12
@@ -129,7 +129,7 @@
this.response = response;
}
-public Object run() throws ServletException, IOException {
+public Object run() throws java.lang.Exception {
doForward(request,response);
return null;
}
@@ -397,17 +397,10 @@
if ( log.isDebugEnabled() )
log.debug( Non-HTTP Forward);
-// only set the Dispatcher Type to Forward if it has not been set. It
will have
-// been set by the ErrorDispatcherValue in the case of an ERROR
-// it will be REQUEST coming in from the StandardWrapperValue and
-// ERROR coming from the ErrorDispatcherValue
-if (request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR)
!= null){
-Integer disInt =
(Integer)request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR);
-if (disInt.intValue() != ApplicationFilterFactory.ERROR) {
-
request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
-
request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR, new
Integer(ApplicationFilterFactory.FORWARD));
-}
-}
+
+
outerRequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
+
outerRequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR, new
Integer(ApplicationFilterFactory.FORWARD));
+
invoke(request, response);
}
@@ -416,17 +409,11 @@
if ( log.isDebugEnabled() )
log.debug( Named Dispatcher Forward);
-// only set the Dispatcher Type to Forward if it has not been set. It
will have
-// been set by the ErrorDispatcherValue in the case of an ERROR
-// it will be REQUEST coming in from the StandardWrapperValue and
-// ERROR coming from the ErrorDispatcherValue
-if (request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR)
!= null){
-Integer disInt =
(Integer)request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR);
-if (disInt.intValue() != ApplicationFilterFactory.ERROR) {
-
request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
-
request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR, new
Integer(ApplicationFilterFactory.FORWARD));
-}
-}
+
+
+
request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
+request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR, new
Integer(ApplicationFilterFactory.FORWARD));
+
invoke(request, response);
}
@@ -468,17 +455,9 @@
wrequest.setQueryParams(queryString);
}
-// only set the Dispatcher Type to Forward if it has not been set. It
will have
-// been set by the ErrorDispatcherValue in the case of an ERROR
-// it will be REQUEST coming in from the StandardWrapperValue and
-// ERROR coming from the ErrorDispatcherValue
-if
(wrequest.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR) != null){
-Integer disInt =
(Integer)request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR);
-if (disInt.intValue() != ApplicationFilterFactory.ERROR) {
-
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
-
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR, new
Integer(ApplicationFilterFactory.FORWARD));
-}
-}
+
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
jfarcand2003/02/19 12:05:33
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
Fix bug introduced by myself. The forward information must be based on the original
request, not on the forwarded one. Thanks to Jan for pointing the problem.
Revision ChangesPath
1.11 +16 -18
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApplicationDispatcher.java18 Feb 2003 23:49:45 - 1.10
+++ ApplicationDispatcher.java19 Feb 2003 20:05:33 - 1.11
@@ -365,6 +365,7 @@
private void doForward(ServletRequest request, ServletResponse response)
throws ServletException, IOException
{
+
// Reset any output that has been buffered, but keep headers/cookies
if (response.isCommitted()) {
if ( log.isDebugEnabled() )
@@ -451,21 +452,18 @@
wrequest.setServletPath(servletPath);
wrequest.setPathInfo(pathInfo);
-if (sb.length() 0)
-wrequest.setAttribute(Globals.FORWARD_REQUEST_URI_ATTR,
- sb.toString());
-if (contextPath != null)
-wrequest.setAttribute(Globals.FORWARD_CONTEXT_PATH_ATTR,
- contextPath);
-if (servletPath != null)
-wrequest.setAttribute(Globals.FORWARD_SERVLET_PATH_ATTR,
- servletPath);
-if (pathInfo != null)
-wrequest.setAttribute(Globals.FORWARD_PATH_INFO_ATTR,
- pathInfo);
+wrequest.setAttribute(Globals.FORWARD_REQUEST_URI_ATTR,
+ hrequest.getRequestURI());
+wrequest.setAttribute(Globals.FORWARD_CONTEXT_PATH_ATTR,
+ hrequest.getContextPath());
+wrequest.setAttribute(Globals.FORWARD_SERVLET_PATH_ATTR,
+ hrequest.getServletPath());
+wrequest.setAttribute(Globals.FORWARD_PATH_INFO_ATTR,
+ hrequest.getPathInfo());
+wrequest.setAttribute(Globals.FORWARD_QUERY_STRING_ATTR,
+ hrequest.getQueryString());
+
if (queryString != null) {
-wrequest.setAttribute(Globals.FORWARD_QUERY_STRING_ATTR,
- queryString);
wrequest.setQueryString(queryString);
wrequest.setQueryParams(queryString);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
Does anybody knows this when tomcat starts within idea
and uses a web.xml file
Invalid PUBLIC ID: -//Sun Microsystems, Inc.//DTD Web Application 1.2//EN
Thanks
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, February 19, 2003 3:06 PM
To: [EMAIL PROTECTED]
Subject: cvs commit:
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
jfarcand2003/02/19 12:05:33
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
Fix bug introduced by myself. The forward information must be based on the
original request, not on the forwarded one. Thanks to Jan for pointing the
problem.
Revision ChangesPath
1.11 +16 -18
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/Applicat
ionDispatcher.java
Index: ApplicationDispatcher.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/cor
e/ApplicationDispatcher.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApplicationDispatcher.java18 Feb 2003 23:49:45 - 1.10
+++ ApplicationDispatcher.java19 Feb 2003 20:05:33 - 1.11
@@ -365,6 +365,7 @@
private void doForward(ServletRequest request, ServletResponse
response)
throws ServletException, IOException
{
+
// Reset any output that has been buffered, but keep
headers/cookies
if (response.isCommitted()) {
if ( log.isDebugEnabled() )
@@ -451,21 +452,18 @@
wrequest.setServletPath(servletPath);
wrequest.setPathInfo(pathInfo);
-if (sb.length() 0)
-wrequest.setAttribute(Globals.FORWARD_REQUEST_URI_ATTR,
- sb.toString());
-if (contextPath != null)
-wrequest.setAttribute(Globals.FORWARD_CONTEXT_PATH_ATTR,
- contextPath);
-if (servletPath != null)
-wrequest.setAttribute(Globals.FORWARD_SERVLET_PATH_ATTR,
- servletPath);
-if (pathInfo != null)
-wrequest.setAttribute(Globals.FORWARD_PATH_INFO_ATTR,
- pathInfo);
+wrequest.setAttribute(Globals.FORWARD_REQUEST_URI_ATTR,
+ hrequest.getRequestURI());
+wrequest.setAttribute(Globals.FORWARD_CONTEXT_PATH_ATTR,
+ hrequest.getContextPath());
+wrequest.setAttribute(Globals.FORWARD_SERVLET_PATH_ATTR,
+ hrequest.getServletPath());
+wrequest.setAttribute(Globals.FORWARD_PATH_INFO_ATTR,
+ hrequest.getPathInfo());
+wrequest.setAttribute(Globals.FORWARD_QUERY_STRING_ATTR,
+ hrequest.getQueryString());
+
if (queryString != null) {
-wrequest.setAttribute(Globals.FORWARD_QUERY_STRING_ATTR,
- queryString);
wrequest.setQueryString(queryString);
wrequest.setQueryParams(queryString);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java ApplicationHttpRequest.java
luehe 2003/02/18 15:49:46
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
ApplicationHttpRequest.java
Log:
Followup to fix for Bugtraq 4658324:
Only in the case of the forward (not include!) method of the
RequestDispatcher must the path elements of the request object
(including queryString) exposed to the target servlet reflect the path
used to obtain the RequestDispatcher (in the case of the include
method, the path elements of the original request are preserved).
Revision ChangesPath
1.10 +6 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApplicationDispatcher.java12 Feb 2003 17:39:11 - 1.9
+++ ApplicationDispatcher.java18 Feb 2003 23:49:45 - 1.10
@@ -467,6 +467,7 @@
wrequest.setAttribute(Globals.FORWARD_QUERY_STRING_ATTR,
queryString);
wrequest.setQueryString(queryString);
+ wrequest.setQueryParams(queryString);
}
// only set the Dispatcher Type to Forward if it has not been set. It
will have
@@ -627,7 +628,7 @@
if (queryString != null) {
wrequest.setAttribute(Globals.INCLUDE_QUERY_STRING_ATTR,
queryString);
- wrequest.setQueryString(queryString);
+ wrequest.setQueryParams(queryString);
}
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
1.4 +23 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationHttpRequest.java 12 Feb 2003 17:39:11 - 1.3
+++ ApplicationHttpRequest.java 18 Feb 2003 23:49:45 - 1.4
@@ -191,6 +191,12 @@
/**
+ * The query parameters for the current request.
+ */
+private String queryParamString = null;
+
+
+/**
* Have the parameters for this request already been parsed?
*/
private boolean parsedParams = false;
@@ -544,6 +550,17 @@
}
+/**
+ * Save query parameters for this request.
+ *
+ * @param queryString The query string containing parameters for this
+ *request
+ */
+void setQueryParams(String queryString) {
+this.queryParamString = queryString;
+}
+
+
// -- Protected Methods
@@ -613,7 +630,7 @@
*/
private void mergeParameters() {
-if ((queryString == null) || (queryString.length() 1))
+if ((queryParamString == null) || (queryParamString.length() 1))
return;
HashMap queryParameters = new HashMap();
@@ -622,7 +639,7 @@
encoding = ISO-8859-1;
try {
RequestUtil.parseParameters
-(queryParameters, queryString, encoding);
+(queryParameters, queryParamString, encoding);
} catch (Exception e) {
;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java ApplicationHttpRequest.java
luehe 2003/02/12 09:39:11
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
ApplicationHttpRequest.java
Log:
According to SRV.4.1.1 (When Parameters Are Available), post form
data must be available to the servlet via the request object's input
stream until the first call to a method of the getParameter family.
Post form data used to be consumed from the input stream and added to
the parameter set *before* any such method call.
It is now read from the input stream as part of the method call.
Revision ChangesPath
1.9 +5 -9
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApplicationDispatcher.java29 Jan 2003 01:42:38 - 1.8
+++ ApplicationDispatcher.java12 Feb 2003 17:39:11 - 1.9
@@ -466,11 +466,7 @@
if (queryString != null) {
wrequest.setAttribute(Globals.FORWARD_QUERY_STRING_ATTR,
queryString);
-}
-
-if (queryString != null) {
wrequest.setQueryString(queryString);
-wrequest.mergeParameters(queryString);
}
// only set the Dispatcher Type to Forward if it has not been set. It
will have
@@ -631,7 +627,7 @@
if (queryString != null) {
wrequest.setAttribute(Globals.INCLUDE_QUERY_STRING_ATTR,
queryString);
-wrequest.mergeParameters(queryString);
+ wrequest.setQueryString(queryString);
}
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
1.3 +74 -51
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationHttpRequest.java 17 Dec 2002 20:06:20 - 1.2
+++ ApplicationHttpRequest.java 12 Feb 2003 17:39:11 - 1.3
@@ -190,6 +190,12 @@
StringManager.getManager(Constants.Package);
+/**
+ * Have the parameters for this request already been parsed?
+ */
+private boolean parsedParams = false;
+
+
// - ServletRequest Methods
@@ -276,6 +282,7 @@
*/
public String getParameter(String name) {
+ parseParameters();
synchronized (parameters) {
Object value = parameters.get(name);
if (value == null)
@@ -297,6 +304,7 @@
*/
public Map getParameterMap() {
+ parseParameters();
return (parameters);
}
@@ -308,6 +316,7 @@
*/
public Enumeration getParameterNames() {
+ parseParameters();
synchronized (parameters) {
return (new Enumerator(parameters.keySet()));
}
@@ -323,6 +332,7 @@
*/
public String[] getParameterValues(String name) {
+ parseParameters();
synchronized (parameters) {
Object value = parameters.get(name);
if (value == null)
@@ -389,7 +399,6 @@
// Package Methods
-
/**
* Return descriptive information about this implementation.
*/
@@ -423,47 +432,6 @@
/**
- * Merge the parameters from the specified query string (if any), and
- * the parameters already present on this request (if any), such that
- * the parameter values from the query string show up first if there are
- * duplicate parameter names.
- *
- * @param queryString The query string containing parameters to be merged
- */
-void mergeParameters(String queryString) {
-
-if ((queryString == null) || (queryString.length() 1))
-return;
-
-HashMap queryParameters = new HashMap();
-String encoding = getCharacterEncoding();
-if (encoding == null)
-encoding = ISO-8859-1;
-try {
-RequestUtil.parseParameters
-(queryParameters, queryString, encoding);
-} catch (Exception e)
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
jfarcand2003/01/28 17:42:38
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
Fix Bug 16078 Request parameter aggregation when using jsp-param is no longer
working. mergeParameters was called twice.
Revision ChangesPath
1.8 +4 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ApplicationDispatcher.java17 Dec 2002 20:06:20 - 1.7
+++ ApplicationDispatcher.java29 Jan 2003 01:42:38 - 1.8
@@ -466,7 +466,6 @@
if (queryString != null) {
wrequest.setAttribute(Globals.FORWARD_QUERY_STRING_ATTR,
queryString);
-wrequest.mergeParameters(queryString);
}
if (queryString != null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
costin 2002/12/05 07:44:30
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
One more conversion to c-l
Revision ChangesPath
1.5 +62 -55
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApplicationDispatcher.java12 Sep 2002 00:09:27 - 1.4
+++ ApplicationDispatcher.java5 Dec 2002 15:44:30 - 1.5
@@ -97,6 +97,8 @@
import org.apache.catalina.core.StandardWrapper;
import org.apache.catalina.util.InstanceSupport;
import org.apache.catalina.util.StringManager;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
/**
@@ -186,8 +188,8 @@
else
this.support = new InstanceSupport(wrapper);
-if (debug = 1)
-log(servletPath= + this.servletPath + , pathInfo= +
+if ( log.isDebugEnabled() )
+log.debug(servletPath= + this.servletPath + , pathInfo= +
this.pathInfo + , queryString= + queryString +
, name= + this.name);
@@ -195,8 +197,8 @@
// the request parameters appropriately
String jspFile = wrapper.getJspFile();
if (jspFile != null) {
-if (debug = 1)
-log(--servletPath= + jspFile);
+if ( log.isDebugEnabled() )
+log.debug(--servletPath= + jspFile);
this.servletPath = jspFile;
}
@@ -205,6 +207,7 @@
// - Instance Variables
+private static Log log = LogFactory.getLog(ApplicationDispatcher.class);
/**
* The request specified by the dispatching application.
@@ -362,16 +365,16 @@
{
// Reset any output that has been buffered, but keep headers/cookies
if (response.isCommitted()) {
-if (debug = 1)
-log( Forward on committed response -- ISE);
+if ( log.isDebugEnabled() )
+log.debug( Forward on committed response -- ISE);
throw new IllegalStateException
(sm.getString(applicationDispatcher.forward.ise));
}
try {
response.resetBuffer();
} catch (IllegalStateException e) {
-if (debug = 1)
-log( Forward resetBuffer() returned ISE: + e);
+if ( log.isDebugEnabled() )
+log.debug( Forward resetBuffer() returned ISE: + e);
throw e;
}
@@ -389,8 +392,8 @@
// Handle a non-HTTP forward by passing the existing request/response
if ((hrequest == null) || (hresponse == null)) {
-if (debug = 1)
-log( Non-HTTP Forward);
+if ( log.isDebugEnabled() )
+log.debug( Non-HTTP Forward);
// only set the Dispatcher Type to Forward if it has not been set. It
will have
// been set by the ErrorDispatcherValue in the case of an ERROR
// it will be REQUEST coming in from the StandardWrapperValue and
@@ -408,8 +411,8 @@
// Handle an HTTP named dispatcher forward
else if ((servletPath == null) (pathInfo == null)) {
-if (debug = 1)
-log( Named Dispatcher Forward);
+if ( log.isDebugEnabled() )
+log.debug( Named Dispatcher Forward);
// only set the Dispatcher Type to Forward if it has not been set. It
will have
// been set by the ErrorDispatcherValue in the case of an ERROR
// it will be REQUEST coming in from the StandardWrapperValue and
@@ -428,8 +431,8 @@
// Handle an HTTP path-based forward
else {
-if (debug = 1)
-log( Path Based Forward);
+if ( log.isDebugEnabled() )
+log.debug( Path Based Forward);
ApplicationHttpRequest wrequest =
(ApplicationHttpRequest) wrapRequest();
@@ -466,13 +469,15 @@
}
-// Commit and close the response before we return
-if (debug = 1)
-log( Committing and closing response);
+// This is not a real close in order to support error processing
+if ( log.isDebugEnabled() )
+log.debug( Disabling the response for futher output);
-if (response instanceof ResponseFacade) {
+if (response
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
amyroh 2002/12/05 18:49:39
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
Fix for bugtraq 4787595.
Filter did not work correctly with JSPs as servlet jsp-file.
Revision ChangesPath
1.6 +15 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApplicationDispatcher.java5 Dec 2002 15:44:30 - 1.5
+++ ApplicationDispatcher.java6 Dec 2002 02:49:39 - 1.6
@@ -180,6 +180,7 @@
this.wrapper = wrapper;
this.context = (Context) wrapper.getParent();
this.servletPath = servletPath;
+this.origServletPath = servletPath;
this.pathInfo = pathInfo;
this.queryString = queryString;
this.name = name;
@@ -281,7 +282,8 @@
*/
private String servletPath = null;
-
+private String origServletPath = null;
+
/**
* The StringManager for this package.
*/
@@ -401,7 +403,7 @@
if (request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR)
!= null){
Integer disInt =
(Integer)request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR);
if (disInt.intValue() != ApplicationFilterFactory.ERROR) {
-
request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
servletPath);
+
request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR, new
Integer(ApplicationFilterFactory.FORWARD));
}
}
@@ -420,7 +422,7 @@
if (request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR)
!= null){
Integer disInt =
(Integer)request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR);
if (disInt.intValue() != ApplicationFilterFactory.ERROR) {
-
request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
servletPath);
+
request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR, new
Integer(ApplicationFilterFactory.FORWARD));
}
}
@@ -460,7 +462,7 @@
if
(wrequest.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR) != null){
Integer disInt =
(Integer)request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR);
if (disInt.intValue() != ApplicationFilterFactory.ERROR) {
-
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
servletPath);
+
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR, new
Integer(ApplicationFilterFactory.FORWARD));
}
}
@@ -539,7 +541,6 @@
private void doInclude(ServletRequest request, ServletResponse response)
throws ServletException, IOException
{
-
// Set up to handle the specified request and response
setup(request, response, true);
@@ -553,9 +554,9 @@
if ( log.isDebugEnabled() )
log.debug( Non-HTTP Include);
- request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
+request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
new
Integer(ApplicationFilterFactory.INCLUDE));
-
request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
servletPath);
+
request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
invoke(request, outerResponse);
unwrapResponse();
@@ -574,7 +575,7 @@
wrequest.setServletPath(servletPath);
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
new
Integer(ApplicationFilterFactory.INCLUDE));
-
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
servletPath);
+
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
