tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core OutputBuffer.java
Date Tue, 27 Feb 2001 02:45:02 GMT
costin      01/02/26 18:45:02

  Modified:    src/share/org/apache/tomcat/core OutputBuffer.java
  Log:
  Added few more checks for null and few more accessor methods.
  
  Revision  Changes    Path
  1.13      +31 -2     jakarta-tomcat/src/share/org/apache/tomcat/core/OutputBuffer.java
  
  Index: OutputBuffer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/OutputBuffer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- OutputBuffer.java	2001/02/10 23:28:15	1.12
  +++ OutputBuffer.java	2001/02/27 02:45:02	1.13
  @@ -112,6 +112,11 @@
    	cbuf=new char[defaultCharBufferSize];
       }
   
  +    public OutputBuffer(int size) {
  +	buf=new byte[size];
  + 	cbuf=new char[size];
  +    }
  +
       public OutputBuffer(Response resp) {
   	buf=new byte[defaultBufferSize];
    	cbuf=new char[defaultCharBufferSize];
  @@ -124,6 +129,23 @@
   	cm=req.getContextManager();
       }
   
  +    public byte[] getBuffer() {
  +	return buf;
  +    }
  +
  +    /** Return the first available position in the byte buffer
  +	( or the number of bytes written ).
  +    */
  +    public int getByteOff() {
  +	return count;
  +    }
  +
  +    /** Set the write position in the byte buffer
  +     */
  +    public void setByteOff(int c) {
  +	count=c;
  +    }
  +
       void log( String s ) {
   	System.out.println("OutputBuffer: " + s );
       }
  @@ -134,6 +156,7 @@
       private void realWrite(Request req, Response res, byte buf[], int off, int cnt )
   	throws IOException
       {
  +	if( res==null ) return;
   	// If this is the first write ( or flush )
   	if (!res.isBufferCommitted()) {
   	    res.endHeaders();
  @@ -386,6 +409,10 @@
       Hashtable encoders=new Hashtable();
       WriteConvertor conv;
   
  +    public void setEncoding(String s) {
  +	enc=s;
  +    }
  +
       void cWrite( char c[], int off, int len ) throws IOException {
   	if( debug > 0 ) log("cWrite(c,o,l) " + ccount + " " + len);
   	if( !gotEnc ) setConverter();
  @@ -396,7 +423,8 @@
       }
   
       private void setConverter() {
  -	enc = resp.getCharacterEncoding();
  +	if( resp!=null ) 
  +	    enc = resp.getCharacterEncoding();
   	gotEnc=true;
   	if(enc==null) enc="8859_1";
   	conv=(WriteConvertor)encoders.get(enc);
  @@ -455,7 +483,8 @@
   	bytesWritten=0;
           ccount=0;
           charsWritten=0;
  -
  +	gotEnc=false;
  +	enc=null;
       }
   
       public int getBufferSize() {
  
  
  

Mime
View raw message