tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves ErrorDispatcherValve.java ErrorReportValve.java
Date Fri, 28 Sep 2001 16:59:22 GMT
remm        01/09/28 09:59:22

  Modified:    catalina/src/share/org/apache/catalina/valves
                        ErrorDispatcherValve.java ErrorReportValve.java
  Log:
  - Unsuspend and uncommit the response before doing the error page dispatch
    and the error page output.
  
  Revision  Changes    Path
  1.4       +8 -6      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ErrorDispatcherValve.java	2001/09/27 01:00:05	1.3
  +++ ErrorDispatcherValve.java	2001/09/28 16:59:22	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $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 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java,v
1.4 2001/09/28 16:59:22 remm Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/09/28 16:59:22 $
    *
    * ====================================================================
    *
  @@ -104,7 +104,7 @@
    *
    * @author Remy Maucherat
    * @author Craig R. McClanahan
  - * @version $Revision: 1.3 $ $Date: 2001/09/27 01:00:05 $
  + * @version $Revision: 1.4 $ $Date: 2001/09/28 16:59:22 $
    */
   
   public class ErrorDispatcherValve
  @@ -169,6 +169,8 @@
           // Perform the request
           context.invokeNext(request, response);
   
  +        response.setSuspended(false);
  +
           ServletRequest sreq = request.getRequest();
           Throwable t = (Throwable) sreq.getAttribute(Globals.EXCEPTION_ATTR);
   
  @@ -224,7 +226,7 @@
           }
   
           if (errorPage != null) {
  -            response.recycleFacade();
  +            response.setAppCommitted(false);
               ServletRequest sreq = request.getRequest();
               ServletResponse sresp = response.getResponse();
               sreq.setAttribute(Globals.ERROR_MESSAGE_ATTR,
  @@ -277,7 +279,7 @@
           Context context = request.getContext();
           ErrorPage errorPage = context.findErrorPage(statusCode);
           if (errorPage != null) {
  -            response.recycleFacade();
  +            response.setAppCommitted(false);
               ServletRequest sreq = request.getRequest();
               ServletResponse sresp = response.getResponse();
               sreq.setAttribute(Globals.STATUS_CODE_ATTR,
  
  
  
  1.4       +6 -4      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
  
  Index: ErrorReportValve.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ErrorReportValve.java	2001/09/27 01:01:10	1.3
  +++ ErrorReportValve.java	2001/09/28 16:59:22	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
1.3 2001/09/27 01:01:10 remm Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/09/27 01:01:10 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
1.4 2001/09/28 16:59:22 remm Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/09/28 16:59:22 $
    *
    * ====================================================================
    *
  @@ -104,7 +104,7 @@
    * @author Craig R. McClanahan
    * @author <a href="mailto:nicolaken@supereva.it">Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.3 $ $Date: 2001/09/27 01:01:10 $
  + * @version $Revision: 1.4 $ $Date: 2001/09/28 16:59:22 $
    */
   
   public class ErrorReportValve
  @@ -172,6 +172,8 @@
           ServletResponse sresp = (ServletResponse) response;
           if (sresp.isCommitted())
               return;
  +
  +        response.setSuspended(false);
   
           ServletRequest sreq = (ServletRequest) request;
           Throwable throwable = 
  
  
  

Mime
View raw message