Author: fhanik
Date: Thu Jun 7 06:31:16 2007
New Revision: 545175
URL: http://svn.apache.org/viewvc?view=rev&rev=545175
Log:
Undoing check in from pero 545127
http://svn.apache.org/viewvc?view=rev&rev=545127
Too close to release and no correspondence on tomcat-dev
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java?view=diff&rev=545175&r1=545174&r2=545175
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Thu Jun 7 06:31:16 2007
@@ -336,11 +336,7 @@
HttpServletResponse hresponse = null;
if (response instanceof HttpServletResponse)
hresponse = (HttpServletResponse) response;
-
- IOException ioException = null;
- ServletException servletException = null;
- RuntimeException runtimeException = null;
-
+
// Handle a non-HTTP forward by passing the existing request/response
if ((hrequest == null) || (hresponse == null)) {
@@ -365,19 +361,11 @@
wrequest.setPathInfo(hrequest.getPathInfo());
wrequest.setQueryString(hrequest.getQueryString());
- try {
- processRequest(request,response,state);
- } catch ( ServletException sexp) {
- servletException = sexp ;
- } catch ( IOException iexp) {
- ioException = iexp ;
- } catch ( RuntimeException rexp) {
- runtimeException = rexp ;
- } finally {
- wrequest.recycle();
- // is called at invoke
- // unwrapRequest(state);
- }
+ processRequest(request,response,state);
+
+ wrequest.recycle();
+ unwrapRequest(state);
+
}
// Handle an HTTP path-based forward
@@ -411,19 +399,11 @@
wrequest.setQueryString(queryString);
wrequest.setQueryParams(queryString);
}
- try {
- processRequest(request,response,state);
- } catch ( ServletException sexp) {
- servletException = sexp ;
- } catch ( IOException iexp) {
- ioException = iexp ;
- } catch ( RuntimeException rexp) {
- runtimeException = rexp ;
- } finally {
- wrequest.recycle();
- // is called at invoke
- // unwrapRequest(state);
- }
+
+ processRequest(request,response,state);
+
+ wrequest.recycle();
+ unwrapRequest(state);
}
@@ -459,14 +439,6 @@
}
}
- // Rethrow an exception if one was thrown by the invoked servlet
- if (ioException != null)
- throw ioException;
- if (servletException != null)
- throw servletException;
- if (runtimeException != null)
- throw runtimeException;
-
}
@@ -581,12 +553,9 @@
wrequest.setAttribute(
ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
servletPath);
- try {
- invoke(state.outerRequest, state.outerResponse, state);
- } finally {
- wrequest.recycle();
- }
-
+ invoke(state.outerRequest, state.outerResponse, state);
+
+ wrequest.recycle();
}
// Handle an HTTP path based include
@@ -622,11 +591,9 @@
wrequest.setAttribute(
ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
servletPath);
- try {
- invoke(state.outerRequest, state.outerResponse, state);
- } finally {
- wrequest.recycle();
- }
+ invoke(state.outerRequest, state.outerResponse, state);
+
+ wrequest.recycle();
}
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=545175&r1=545174&r2=545175
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jun 7 06:31:16 2007
@@ -102,12 +102,7 @@
</add>
<add>
And getSession() operation to StandardManager and DeltaManager JMX
Interface (pero)
- </add>
- <fix>
- <bug>30949</bug>: Fix correct ApplicationDispatcher forward/include
handling after an exception is thrown.
- This patch fix a memory leak as
<code>STRICT_SERVLET_COMPLIANCE</code> system property is enabled and that
cluster
- crossContext session replication working correct after an exception
is thrown at a RequestDispatcher.forward/include() call. (pero)
- </fix>
+ </add>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
