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

[remm]

remm        01/03/26 17:41:10

  Modified:    src/webdav/client/src/org/apache/webdav/util
                        WebdavResource.java
  Log:
  - Fix for a NPE when date can't be parsed correctly.
  - Fix the ISO date format.
  
  Revision  Changes    Path
  1.20      +10 -8     
jakarta-slide/src/webdav/client/src/org/apache/webdav/util/WebdavResource.java
  
  Index: WebdavResource.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/util/WebdavResource.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- WebdavResource.java       2001/03/26 11:08:29     1.19
  +++ WebdavResource.java       2001/03/27 01:41:10     1.20
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/util/WebdavResource.java,v
 1.19 2001/03/26 11:08:29 jericho Exp $
  - * $Revision: 1.19 $
  - * $Date: 2001/03/26 11:08:29 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/util/WebdavResource.java,v
 1.20 2001/03/27 01:41:10 remm Exp $
  + * $Revision: 1.20 $
  + * $Date: 2001/03/27 01:41:10 $
    *
    * ====================================================================
    *
  @@ -218,7 +218,7 @@
           new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US),
           new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
           new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US),
  -        new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.sss'Z'", Locale.US)
  +        new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US)
       };
    
   
  @@ -875,8 +875,9 @@
         * @see #setGetLastModified(long)
        */
       public void setGetLastModified(String getLastModified) {
  -             Date date = parseDate(getLastModified);
  -             this.getLastModified = date.getTime();
  +        Date date = parseDate(getLastModified);
  +        if (date != null)
  +            this.getLastModified = date.getTime();
       }
   
   
  @@ -906,8 +907,9 @@
        * @param creationDate The creationdate string.
        */
       public void setCreationDate(String creationDate) {
  -             Date date = parseDate(creationDate);
  -        this.creationDate = date.getTime();
  +        Date date = parseDate(creationDate);
  +        if (date != null)
  +            this.creationDate = date.getTime();
       }