Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
Reply-To: tomcat-dev@jakarta.apache.org
Date: 23 May 2001 03:09:28 -0000
Message-ID: <20010523030928.71657.qmail@apache.org>
From: larryi@apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
 Response.java

larryi      01/05/22 20:09:26

  Modified:    src/share/org/apache/tomcat/core Response.java
  Log:
  Update setBufferSize() to use OutputBuffer.isNew() to detect if buffer has
  been written. Fixes Watchdog servlet failure.
  
  Revision  Changes    Path
  1.51      +1 -8      jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java
  
  Index: Response.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- Response.java	2001/02/26 04:34:16	1.50
  +++ Response.java	2001/05/23 03:09:21	1.51
  @@ -382,14 +382,7 @@
       }
   
       public void setBufferSize(int size) throws IllegalStateException {
  -	// Force the PrintWriter to flush the data to the OutputStream.
  -	//	if (usingWriter == true && writer != null ) writer.flush();
  -        try{
  -            oBuffer.flushChars();
  -        }catch(IOException ex){
  -                ;
  -        }
  -	if( oBuffer.getBytesWritten() >0) {
  +	if( !oBuffer.isNew() ) {
   	    throw new IllegalStateException ( sm.getString("servletOutputStreamImpl.setbuffer.ise"));
   	}
   	oBuffer.setBufferSize( size );