cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/lib ResponseInputStream.java

[remm]

remm        01/03/05 10:00:26

  Modified:    src/webdav/client/src/org/apache/webdav/lib
                        ResponseInputStream.java
  Log:
  - Parsing of the chunk length is more robust (should prevent some NPEs).
  
  Revision  Changes    Path
  1.4       +9 -5      
jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/ResponseInputStream.java
  
  Index: ResponseInputStream.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/ResponseInputStream.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ResponseInputStream.java  2001/03/01 22:00:59     1.3
  +++ ResponseInputStream.java  2001/03/05 18:00:23     1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/ResponseInputStream.java,v
 1.3 2001/03/01 22:00:59 jericho Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/03/01 22:00:59 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/ResponseInputStream.java,v
 1.4 2001/03/05 18:00:23 remm Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/03/05 18:00:23 $
    *
    * ====================================================================
    *
  @@ -74,7 +74,7 @@
    * Socket input stream wrapper.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
  - * @version $Revision: 1.3 $ $Date: 2001/03/01 22:00:59 $
  + * @version $Revision: 1.4 $ $Date: 2001/03/05 18:00:23 $
    */
   
   public class ResponseInputStream
  @@ -240,7 +240,11 @@
                   chunkPos = 0;
   
                   try {
  -                    chunkLength = Integer.parseInt(readLine().trim(), 16);
  +                    String line = readLine();
  +                    if (line != null)
  +                        chunkLength = Integer.parseInt(readLine().trim(), 16);
  +                    else
  +                        chunkLength = 0;
                   } catch (NumberFormatException e) {
                       // Critical error, unable to parse the chunk length
                       chunkLength = 0;