Return-Path: <marcsaeg@apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 78658 invoked by uid 500); 4 Mar 2001 03:26:22 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 78655 invoked by uid 1225); 4 Mar 2001 03:26:22 -0000
Date: 4 Mar 2001 03:26:22 -0000
Message-ID: <20010304032622.78654.qmail@apache.org>
From: marcsaeg@apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime
 BodyContentImpl.java

marcsaeg    01/03/03 19:26:22

  Modified:    src/share/org/apache/jasper/runtime Tag: tomcat_32
                        BodyContentImpl.java
  Log:
  BodyContentImpl.java
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.6.1   +6 -8      jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java
  
  Index: BodyContentImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.6.6.1
  diff -u -r1.6 -r1.6.6.1
  --- BodyContentImpl.java	1999/11/13 00:32:51	1.6
  +++ BodyContentImpl.java	2001/03/04 03:26:21	1.6.6.1
  @@ -88,7 +88,7 @@
           super(writer);
   	cb = new char[bufferSize];
   	nextChar = 0;
  -    }
  +	 }
   
       /**
        * Write a single character.
  @@ -107,19 +107,19 @@
           //Need to re-allocate the buffer since it is to be
   	//unbounded according to the updated spec..
   
  -        char[] tmp = new char [bufferSize];
  -	System.arraycopy(cb, 0, tmp, 0, cb.length);
  +        char[] tmp = null;
   
   	//XXX Should it be multiple of DEFAULT_BUFFER_SIZE??
   
   	if (len <= Constants.DEFAULT_BUFFER_SIZE) {
  -	    cb = new char [bufferSize + Constants.DEFAULT_BUFFER_SIZE];
  +	    tmp = new char [bufferSize + Constants.DEFAULT_BUFFER_SIZE];
   	    bufferSize += Constants.DEFAULT_BUFFER_SIZE;
   	} else {
  -	    cb = new char [bufferSize + len];
  +	    tmp = new char [bufferSize + len];
   	    bufferSize += len;
   	}
  -	System.arraycopy(tmp, 0, cb, 0, tmp.length);
  +	System.arraycopy(cb, 0, tmp, 0, cb.length);
  +	cb = tmp;
   	tmp = null;
       }
   
  @@ -499,8 +499,6 @@
   
       public void clear() throws IOException {
           synchronized (lock) {
  -            cb = new char [Constants.DEFAULT_BUFFER_SIZE];
  -	    bufferSize = Constants.DEFAULT_BUFFER_SIZE;
   	    nextChar = 0;
   	}
       }