cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/buf ByteChunk.java

[nacho]

nacho       01/06/03 13:16:46

  Modified:    src/share/org/apache/tomcat/core OutputBuffer.java
               src/share/org/apache/tomcat/util/buf ByteChunk.java
  Log:
  * Fix for ob.getByteOff hack...and reverting previous fix..
  * Use getStart where needed on bb intead of getOffset, a bit clearer.
  
  Submitted by: Kevin Seguin
  
  Revision  Changes    Path
  1.18      +1 -1      
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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- OutputBuffer.java 2001/05/26 17:46:46     1.17
  +++ OutputBuffer.java 2001/06/03 20:16:46     1.18
  @@ -148,7 +148,7 @@
        *  @deprecated Used only in Ajp13Packet for a hack
        */
       public int getByteOff() {
  -     return bb.getOffset();
  +     return bb.getEnd();
       }
   
       /** Set the write position in the byte buffer
  
  
  
  1.6       +4 -4      
jakarta-tomcat/src/share/org/apache/tomcat/util/buf/ByteChunk.java
  
  Index: ByteChunk.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/buf/ByteChunk.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ByteChunk.java    2001/06/02 21:53:46     1.5
  +++ ByteChunk.java    2001/06/03 20:16:46     1.6
  @@ -210,7 +210,7 @@
       }
   
       public int getOffset() {
  -     return getEnd();
  +     return getStart();
       }
   
       public void setOffset(int off) {
  @@ -280,7 +280,7 @@
       public void append( ByteChunk src )
        throws IOException
       {
  -     append( src.getBytes(), src.getOffset(), src.getLength());
  +     append( src.getBytes(), src.getStart(), src.getLength());
       }
   
       /** Add data to the buffer
  @@ -479,7 +479,7 @@
       }
   
       public boolean equals( ByteChunk bb ) {
  -     return equals( bb.getBytes(), bb.getOffset(), bb.getLength());
  +     return equals( bb.getBytes(), bb.getStart(), bb.getLength());
       }
       
       public boolean equals( byte b2[], int off2, int len2) {
  @@ -501,7 +501,7 @@
       }
   
       public boolean equals( CharChunk cc ) {
  -     return equals( cc.getChars(), cc.getOffset(), cc.getLength());
  +     return equals( cc.getChars(), cc.getStart(), cc.getLength());
       }
       
       public boolean equals( char c2[], int off2, int len2) {