Return-Path: <remm@locus.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 53815 invoked by uid 500); 17 Nov 2000 02:58:59 -0000
Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org
Received: (qmail 53812 invoked by uid 1135); 17 Nov 2000 02:58:59 -0000
Date: 17 Nov 2000 02:58:59 -0000
Message-ID: <20001117025859.53811.qmail@locus.apache.org>
From: remm@locus.apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit:
 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector
 RequestBase.java

remm        00/11/16 18:58:59

  Modified:    catalina/src/share/org/apache/catalina/connector
                        RequestBase.java
  Log:
  - Opening the stream is useless if there's nothing to read.
  
  Revision  Changes    Path
  1.7       +5 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java
  
  Index: RequestBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- RequestBase.java	2000/11/15 00:46:41	1.6
  +++ RequestBase.java	2000/11/17 02:58:59	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v 1.6 2000/11/15 00:46:41 remm Exp $
  - * $Revision: 1.6 $
  - * $Date: 2000/11/15 00:46:41 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v 1.7 2000/11/17 02:58:59 remm Exp $
  + * $Revision: 1.7 $
  + * $Date: 2000/11/17 02:58:59 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * the connector-specific methods need to be implemented.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.6 $ $Date: 2000/11/15 00:46:41 $
  + * @version $Revision: 1.7 $ $Date: 2000/11/17 02:58:59 $
    */
   
   public abstract class RequestBase
  @@ -485,7 +485,7 @@
   
           // If neither a reader or an is have been opened, do it to consume
           // request bytes, if any
  -        if ((reader == null) && (stream == null))
  +        if ((reader == null) && (stream == null) && (getContentLength() != 0))
               getInputStream();
   
   	// If a Reader has been acquired, close it