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

2002-05-27 Thread glenn 

glenn   02/05/27 06:34:34

  Modified:catalina/src/share/org/apache/catalina/connector
RequestBase.java
  Log:
  Only log if their is text to log
  
  Revision  ChangesPath
  1.20  +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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- RequestBase.java  23 May 2002 17:22:37 -  1.19
  +++ RequestBase.java  27 May 2002 13:34:34 -  1.20
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
 1.19 2002/05/23 17:22:37 glenn Exp $
  - * $Revision: 1.19 $
  - * $Date: 2002/05/23 17:22:37 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
 1.20 2002/05/27 13:34:34 glenn Exp $
  + * $Revision: 1.20 $
  + * $Date: 2002/05/27 13:34:34 $
*
* 
*
  @@ -100,7 +100,7 @@
* the connector-specific methods need to be implemented.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.19 $ $Date: 2002/05/23 17:22:37 $
  + * @version $Revision: 1.20 $ $Date: 2002/05/27 13:34:34 $
* @deprecated
*/
   
  @@ -560,7 +560,7 @@
   public void recycle() {
   
   String log = SystemLogHandler.stopCapture();
  -if (log != null) {
  +if (log != null  log.length()  0) {
   context.getServletContext().log(log);
   }
   attributes.clear();
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

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

2000-11-16 Thread remm 

remm00/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  ChangesPath
  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

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

2000-11-14 Thread remm 

remm00/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  ChangesPath
  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) {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]