You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@locus.apache.org on 2000/11/15 01:46:41 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector RequestBase.java

remm        00/11/14 16:46:41

  Modified:    catalina/src/share/org/apache/catalina/connector
                        RequestBase.java
  Log:
  - Make sure the request bytes are always consumed.
  
  Revision  Changes    Path
  1.6       +9 -4      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RequestBase.java	2000/10/13 05:27:33	1.5
  +++ RequestBase.java	2000/11/15 00:46:41	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v 1.5 2000/10/13 05:27:33 craigmcc Exp $
  - * $Revision: 1.5 $
  - * $Date: 2000/10/13 05:27:33 $
  + * $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 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * the connector-specific methods need to be implemented.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.5 $ $Date: 2000/10/13 05:27:33 $
  + * @version $Revision: 1.6 $ $Date: 2000/11/15 00:46:41 $
    */
   
   public abstract class RequestBase
  @@ -482,6 +482,11 @@
        * @exception IOException if an input/output error occurs
        */
       public void finishRequest() throws IOException {
  +
  +        // If neither a reader or an is have been opened, do it to consume
  +        // request bytes, if any
  +        if ((reader == null) && (stream == null))
  +            getInputStream();
   
   	// If a Reader has been acquired, close it
   	if (reader != null) {