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

[dirkv]

dirkv       01/07/11 14:07:57

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        PropFindMethod.java
  Log:
  fix problem with non-inherited permissions being reported as inherited
  
  Revision  Changes    Path
  1.26      +10 -3     
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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- PropFindMethod.java       2001/07/10 22:32:24     1.25
  +++ PropFindMethod.java       2001/07/11 21:07:52     1.26
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
 1.25 2001/07/10 22:32:24 remm Exp $
  - * $Revision: 1.25 $
  - * $Date: 2001/07/10 22:32:24 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
 1.26 2001/07/11 21:07:52 dirkv Exp $
  + * $Revision: 1.26 $
  + * $Date: 2001/07/11 21:07:52 $
    *
    * ====================================================================
    *
  @@ -1295,6 +1295,13 @@
                       NodePermission permission = (NodePermission)
                           aclList.nextElement();
                       
  +                    // if we are processing inheritedPermissions (from parent and 
up)
  +                    // then the permission should be inheritable
  +                    if (inheritedPermissions && !permission.isInheritable()) {
  +                     // continue with next permission
  +                     continue;
  +                    }
  +                                     
                       String principal = permission.getSubjectUri();
                       
                       String action = permission.getActionUri();