unico       2004/07/22 14:06:59

  Modified:    webdavclient/clientlib/src/java/org/apache/webdav/lib/properties
                        AclProperty.java
  Log:
  check whether inherited href value is actually different from the resource entity 
href
  if not then the is not inherited
  
  Revision  Changes    Path
  1.3       +12 -8     
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/properties/AclProperty.java
  
  Index: AclProperty.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/properties/AclProperty.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AclProperty.java  11 Feb 2004 11:30:52 -0000      1.2
  +++ AclProperty.java  22 Jul 2004 21:06:59 -0000      1.3
  @@ -161,11 +161,15 @@
   
           child = DOMUtils.getFirstElement(element, "DAV:", "inherited");
           if (child != null) {
  -            href=DOMUtils.getFirstElement(child, "DAV:", "href");
  -            if (href!=null)
  +            href = DOMUtils.getFirstElement(child, "DAV:", "href");
  +            String shref = null;
  +            if (href != null)
               {
  -                ace.setInherited(true);
  -                ace.setInheritedFrom(DOMUtils.getTextValue(href));
  +                shref = DOMUtils.getTextValue(href);
  +                if (!shref.equals(response.getHref())) {
  +                    ace.setInherited(true);
  +                    ace.setInheritedFrom(shref);
  +                }
               }
               else
               {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to