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 di...@apache.org on 2001/08/25 16:29:00 UTC

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

dirkv       01/08/25 07:29:00

  Modified:    src/webdav/client/src/org/apache/webdav/lib
                        WebdavResource.java WebdavSession.java
  Log:
  cleanup use of depricated methods
  
  Revision  Changes    Path
  1.25      +5 -9      jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavResource.java
  
  Index: WebdavResource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavResource.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- WebdavResource.java	2001/08/10 20:40:06	1.24
  +++ WebdavResource.java	2001/08/25 14:29:00	1.25
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavResource.java,v 1.24 2001/08/10 20:40:06 remm Exp $
  - * $Revision: 1.24 $
  - * $Date: 2001/08/10 20:40:06 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavResource.java,v 1.25 2001/08/25 14:29:00 dirkv Exp $
  + * $Revision: 1.25 $
  + * $Date: 2001/08/25 14:29:00 $
    *
    * ====================================================================
    *
  @@ -992,9 +992,7 @@
       private synchronized void setClient(HttpURL httpURL) throws IOException {
           
           if ((client == null) || ((client != null) && !isTheClient())) {
  -            if (client != null) {
  -                closeSession(client);
  -            }
  +            closeSession();
               client = getSessionInstance(httpURL);
           }
       }
  @@ -1654,7 +1652,7 @@
        * Close the session of this client
        */
       public void close() throws IOException {
  -        closeSession(client);
  +        closeSession();
       }
   
   
  @@ -1760,8 +1758,6 @@
        * collection denoted by this pathname.
        *
        * @return An array of pathnames denoting the resources.
  -     * @exception HttpException
  -     * @exception IOException
        */
       public String[] list() {
   
  
  
  
  1.19      +9 -7      jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavSession.java
  
  Index: WebdavSession.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavSession.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- WebdavSession.java	2001/08/13 17:04:11	1.18
  +++ WebdavSession.java	2001/08/25 14:29:00	1.19
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavSession.java,v 1.18 2001/08/13 17:04:11 dirkv Exp $
  - * $Revision: 1.18 $
  - * $Date: 2001/08/13 17:04:11 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavSession.java,v 1.19 2001/08/25 14:29:00 dirkv Exp $
  + * $Revision: 1.19 $
  + * $Date: 2001/08/25 14:29:00 $
    *
    * ====================================================================
    *
  @@ -199,10 +199,12 @@
        */
       public void closeSession()
           throws IOException {
  -        this.client.endSession();
  -        // Remove the progress listener.
  -        // webdavClient.getProgressUtil().addProgressListener(this);
  -        this.client = null;
  +        if (this.client!=null) {
  +            this.client.endSession();
  +            // Remove the progress listener.
  +            // webdavClient.getProgressUtil().addProgressListener(this);
  +            this.client = null;
  +        }
       }