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

[dirkv]

dirkv       01/09/20 17:28:40

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        PropFindMethod.java
  Log:
  Use the new enumerateLocks with inherited true (no change in behavior)
  Fix bug: there was a href element after the self principal (~)
  
  Revision  Changes    Path
  1.36      +5 -6      
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
  
  Index: PropFindMethod.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- PropFindMethod.java       2001/08/17 14:39:12     1.35
  +++ PropFindMethod.java       2001/09/21 00:28:40     1.36
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
 1.35 2001/08/17 14:39:12 cmlenz Exp $
  - * $Revision: 1.35 $
  - * $Date: 2001/08/17 14:39:12 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
 1.36 2001/09/21 00:28:40 dirkv Exp $
  + * $Revision: 1.36 $
  + * $Date: 2001/09/21 00:28:40 $
    *
    * ====================================================================
    *
  @@ -617,8 +617,7 @@
               
               generatedXML.writeElement(null, "href", XMLPrinter.CLOSING);
               
  -            Enumeration lockTokens = lock.enumerateLocks(slideToken,
  -                                                         object.getUri());
  +            Enumeration lockTokens = lock.enumerateLocks(slideToken, 
object.getUri(), true);
               
               if (lockTokens.hasMoreElements()) {
                   objectLockToken = (NodeLock) lockTokens.nextElement();
  @@ -1474,7 +1473,7 @@
           // isn't very clear in the spec
           if (principal.equals("~")) {
               generatedXML.writeElement(null, "self", XMLPrinter.NO_CONTENT);
  -        } if (principal.equals("nobody")) {
  +        } else if (principal.equals("nobody")) {
               generatedXML.writeElement(null, "all",
                                         XMLPrinter.NO_CONTENT);
           } else {