You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by bc...@locus.apache.org on 2000/11/21 08:35:59 UTC

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

bcholmes    00/11/20 23:35:58

  Modified:    src/clients/webdav/src/org/apache/webdav/lib
                        ResponseInputStream.java
  Log:
  Revisions to the client library for:
  - removing unnecessary import statements in methods
  - parse the response from PROPFIND
  - create an Ant Dav-aware GET task
  
  Revision  Changes    Path
  1.2       +24 -23    jakarta-slide/src/clients/webdav/src/org/apache/webdav/lib/ResponseInputStream.java
  
  Index: ResponseInputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/clients/webdav/src/org/apache/webdav/lib/ResponseInputStream.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ResponseInputStream.java	2000/06/19 07:31:07	1.1
  +++ ResponseInputStream.java	2000/11/21 07:35:57	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/clients/webdav/src/org/apache/webdav/lib/ResponseInputStream.java,v 1.1 2000/06/19 07:31:07 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/06/19 07:31:07 $
  + * $Header: /home/cvs/jakarta-slide/src/clients/webdav/src/org/apache/webdav/lib/ResponseInputStream.java,v 1.2 2000/11/21 07:35:57 bcholmes Exp $
  + * $Revision: 1.2 $
  + * $Date: 2000/11/21 07:35:57 $
    *
    * ====================================================================
    *
  @@ -74,7 +74,7 @@
    * Socket input stream wrapper.
    * 
    * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
  - * @version $Revision: 1.1 $ $Date: 2000/06/19 07:31:07 $
  + * @version $Revision: 1.2 $ $Date: 2000/11/21 07:35:57 $
    */
   
   public class ResponseInputStream
  @@ -186,32 +186,33 @@
        */
       public void close()
           throws IOException {
  -        
  -	if (closed)
  -	    throw new IOException("Stream is closed");
  -        
  -        if (chunk) {
  -            
  -            while (!endChunk) {
  -                int b = read();
  -                if (b < 0)
  -                    break;
  -            }
  -            
  -        } else {
  +/*        
  +        // Xerces appears to doubly-close the input stream...
  +        if (closed)
  +            throw new IOException("Stream is already closed");
  +*/
  +        if (!closed) {        
  +
  +            if (chunk) {
               
  -            if (length > 0) {
  -                while (count < length) {
  +                while (!endChunk) {
                       int b = read();
                       if (b < 0)
                           break;
                   }
  -            }
               
  +            } else {
  +            
  +                if (length > 0) {
  +                    while (count < length) {
  +                        int b = read();
  +                        if (b < 0)
  +                            break;
  +                    }
  +                }
  +            }
  +            closed = true;
           }
  -        
  -	closed = true;
  -        
       }