cvs commit: jakarta-commons/httpclient/src/java/org/apache/commons/httpclient HttpParser.java

[olegk]

olegk       2003/02/20 08:36:20

  Modified:    httpclient/src/java/org/apache/commons/httpclient
                        HttpParser.java
  Log:
  Bug fix: HttpParser#readRawLine method did not properly handle EOF (stream closed) 
condition
  
  Contributed by Sam Maloney <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.2       +6 -0      
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpParser.java
  
  Index: HttpParser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpParser.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HttpParser.java   16 Feb 2003 13:10:16 -0000      1.1
  +++ HttpParser.java   20 Feb 2003 16:36:20 -0000      1.2
  @@ -61,6 +61,9 @@
           if (WIRE_LOG.isDebugEnabled()) {
               WIRE_LOG.debug("<< \"" + buf.toString() + (ch>0 ? "\" [\\r\\n]" : ""));
           }
  +        if (buf.size() == 0) {
  +            return null;
  +        }
           return buf.toByteArray();
       }
   
  @@ -79,6 +82,9 @@
       public static String readLine(InputStream inputStream) throws IOException {
           LOG.trace("enter HttpConnection.readLine()");
           byte[] rawdata = readRawLine(inputStream);
  +        if (rawdata == null) {
  +            return null;
  +        }
           int len = rawdata.length;
           if (( len >= 2) && (rawdata[len - 2] == '\r') && (rawdata[len - 1] == 
'\n')) {
               return HttpConstants.getString(rawdata, 0, rawdata.length - 2);
  
  
  

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