cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method LockMethod.java

[juergen]

juergen     01/07/18 07:36:32

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        LockMethod.java
  Log:
  a timeout of 0 seconds is possible now.
  
  Revision  Changes    Path
  1.13      +5 -10     
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java
  
  Index: LockMethod.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- LockMethod.java   2001/05/16 12:07:54     1.12
  +++ LockMethod.java   2001/07/18 14:36:32     1.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
 1.12 2001/05/16 12:07:54 juergen Exp $
  - * $Revision: 1.12 $
  - * $Date: 2001/05/16 12:07:54 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
 1.13 2001/07/18 14:36:32 juergen Exp $
  + * $Revision: 1.13 $
  + * $Date: 2001/07/18 14:36:32 $
    *
    * ====================================================================
    *
  @@ -141,7 +141,7 @@
       /**
        * Lock duration.
        */
  -    private int lockDuration;
  +    private int lockDuration = DEFAULT_TIMEOUT;
       
       
       /**
  @@ -236,9 +236,7 @@
       }
           
           String lockDurationStr = req.getHeader("Timeout");
  -        if (lockDurationStr == null) {
  -            lockDuration = DEFAULT_TIMEOUT;
  -        } else {
  +        if (lockDurationStr != null) {
               if (lockDurationStr.startsWith("Second-")) {
                   lockDuration =
                       (new Integer(lockDurationStr.substring(7))).intValue();
  @@ -253,9 +251,6 @@
                           lockDuration = MAX_TIMEOUT;
                       }
                   }
  -            }
  -            if (lockDuration == 0) {
  -                lockDuration = DEFAULT_TIMEOUT;
               }
               if (lockDuration > MAX_TIMEOUT) {
                   lockDuration = MAX_TIMEOUT;