remm 01/09/26 18:00:05
Modified: catalina/src/share/org/apache/catalina/valves
ErrorDispatcherValve.java
Log:
- The error dispatcher will recycle the facades before forwarding to an error
page (of course, if the underlying response has been committed, it will still
fail),
so that you can use an error page along with sendError.
Revision Changes Path
1.3 +6 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java
Index: ErrorDispatcherValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ErrorDispatcherValve.java 2001/09/26 17:45:52 1.2
+++ ErrorDispatcherValve.java 2001/09/27 01:00:05 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java,v
1.2 2001/09/26 17:45:52 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2001/09/26 17:45:52 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java,v
1.3 2001/09/27 01:00:05 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/09/27 01:00:05 $
*
* ====================================================================
*
@@ -104,7 +104,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/09/26 17:45:52 $
+ * @version $Revision: 1.3 $ $Date: 2001/09/27 01:00:05 $
*/
public class ErrorDispatcherValve
@@ -224,6 +224,7 @@
}
if (errorPage != null) {
+ response.recycleFacade();
ServletRequest sreq = request.getRequest();
ServletResponse sresp = response.getResponse();
sreq.setAttribute(Globals.ERROR_MESSAGE_ATTR,
@@ -276,6 +277,7 @@
Context context = request.getContext();
ErrorPage errorPage = context.findErrorPage(statusCode);
if (errorPage != null) {
+ response.recycleFacade();
ServletRequest sreq = request.getRequest();
ServletResponse sresp = response.getResponse();
sreq.setAttribute(Globals.STATUS_CODE_ATTR,
