tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade HttpServletResponseFacade.java
Date Tue, 05 Feb 2002 03:54:27 GMT
billbarker    02/02/04 19:54:27

  Modified:    src/facade22/org/apache/tomcat/facade
                        HttpServletResponseFacade.java
  Log:
  Make certain that the Writer isn't in the error state.
  
  This is the quickest and safest fix.  We could try for something better in 3.3.2 if we want.
 However, this almost never happens (since usually an IOException kills the entire thread),
so there really isn't that much extra garbage to collect.
  
  Fix for bug #6234.
  Reported by: Pete Fischer pfischer@bbn.com
  
  Revision  Changes    Path
  1.25      +7 -4      jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java
  
  Index: HttpServletResponseFacade.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- HttpServletResponseFacade.java	30 Jan 2002 03:37:12 -0000	1.24
  +++ HttpServletResponseFacade.java	5 Feb 2002 03:54:27 -0000	1.25
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
1.24 2002/01/30 03:37:12 billbarker Exp $
  - * $Revision: 1.24 $
  - * $Date: 2002/01/30 03:37:12 $
  + * $Header: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
1.25 2002/02/05 03:54:27 billbarker Exp $
  + * $Revision: 1.25 $
  + * $Date: 2002/02/05 03:54:27 $
    *
    * ====================================================================
    *
  @@ -106,7 +106,10 @@
       void recycle() {
   	usingStream = false;
   	usingWriter= false;
  -	//	writer=null; // fixed ( ? )
  +	if( writer.checkError() ) {
  +	    OutputBuffer oBuffer= response.getBuffer();
  +	    writer = new ServletWriterFacade( oBuffer, response);
  +	}
   	if( osFacade != null ) osFacade.recycle();
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message