tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@locus.apache.org
Subject cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector RequestStream.java
Date Sat, 29 Jul 2000 20:33:16 GMT
remm        00/07/29 13:33:16

  Modified:    proposals/catalina/src/share/org/apache/tomcat/connector
                        RequestStream.java
  Log:
  - Fix a bug I found while using Slide (and noticing the PUT of large
    entities was broken ...). The new
    RequestStream.read(byte[] b) function was broken. The problem
    was that the number of bytes read in the array was added
    to the total number of bytes already read, which is wrong since
    the underlying atomic read operations also increment this value.
  
  Revision  Changes    Path
  1.5       +4 -6      jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/RequestStream.java
  
  Index: RequestStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/RequestStream.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RequestStream.java	2000/07/10 16:14:39	1.4
  +++ RequestStream.java	2000/07/29 20:33:15	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/RequestStream.java,v
1.4 2000/07/10 16:14:39 craigmcc Exp $
  - * $Revision: 1.4 $
  - * $Date: 2000/07/10 16:14:39 $
  + * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/RequestStream.java,v
1.5 2000/07/29 20:33:15 remm Exp $
  + * $Revision: 1.5 $
  + * $Date: 2000/07/29 20:33:15 $
    *
    * ====================================================================
    *
  @@ -79,7 +79,7 @@
    * not reading more than that many bytes on the underlying stream.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.4 $ $Date: 2000/07/10 16:14:39 $
  + * @version $Revision: 1.5 $ $Date: 2000/07/29 20:33:15 $
    */
   
   public class RequestStream
  @@ -235,8 +235,6 @@
   		toRead = length - count;
   	}
   	int actuallyRead = super.read(b, off, toRead);
  -	if (actuallyRead >= 0)
  -	    count += actuallyRead;
   	return (actuallyRead);
   
       }
  
  
  

Mime
View raw message