remm        02/05/09 20:43:52

  Modified:    catalina/src/share/org/apache/catalina/valves Tag:
                        tomcat_40_branch ErrorReportValve.java
  Log:
  - Port patch.
  - Don't generate a status report for 304.
  - Submitted by Bill Barker.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.5   +7 -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.5.2.4
  retrieving revision 1.5.2.5
  diff -u -r1.5.2.4 -r1.5.2.5
  --- ErrorReportValve.java     10 May 2002 03:20:58 -0000      1.5.2.4
  +++ ErrorReportValve.java     10 May 2002 03:43:52 -0000      1.5.2.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
 1.5.2.4 2002/05/10 03:20:58 remm Exp $
  - * $Revision: 1.5.2.4 $
  - * $Date: 2002/05/10 03:20:58 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
 1.5.2.5 2002/05/10 03:43:52 remm Exp $
  + * $Revision: 1.5.2.5 $
  + * $Date: 2002/05/10 03:43:52 $
    *
    * ====================================================================
    *
  @@ -104,7 +104,7 @@
    * @author Craig R. McClanahan
    * @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
  - * @version $Revision: 1.5.2.4 $ $Date: 2002/05/10 03:20:58 $
  + * @version $Revision: 1.5.2.5 $ $Date: 2002/05/10 03:43:52 $
    */
   
   public class ErrorReportValve
  @@ -249,6 +249,9 @@
   
           // Do nothing on a 1xx status
           if (statusCode < 300)
  +            return;
  +        // Do nothing on a NOT MODIFIED status
  +        if (statusCode == HttpServletResponse.SC_NOT_MODIFIED)
               return;
   
           // FIXME: Reset part of the request
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to