masonjm 2004/07/27 15:12:10 Modified: src/webdav/server/org/apache/slide/webdav/util PropertyHelper.java Log: Fixed generation of acl property to make a new ace when the value of "inheritedFrom" changes. Revision Changes Path 1.75 +7 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java Index: PropertyHelper.java =================================================================== RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- PropertyHelper.java 13 Jul 2004 13:02:46 -0000 1.74 +++ PropertyHelper.java 27 Jul 2004 22:12:10 -0000 1.75 @@ -1687,13 +1687,15 @@ String currentSubjectUri = ""; boolean currentNegative = false; + String currentInheritedFrom = ""; Element currentAceElm = null; Element currentGrantDenyElm = null; Enumeration permissions = security.enumeratePermissions(sToken, objectNode, true); while (permissions.hasMoreElements()) { NodePermission perm = (NodePermission)permissions.nextElement(); if (!perm.getSubjectUri().equals(currentSubjectUri) - || (perm.isNegative() && !currentNegative || !perm.isNegative() && currentNegative)) { + || (perm.isNegative() && !currentNegative || !perm.isNegative() && currentNegative) + || (!currentInheritedFrom.equals(perm.getInheritedFrom()))) { // save previous ACE if (currentAceElm != null) { @@ -1732,6 +1734,7 @@ currentSubjectUri = perm.getSubjectUri(); currentNegative = perm.isNegative(); + currentInheritedFrom = inheritedFrom != null ? inheritedFrom : ""; } currentGrantDenyElm.addContent(createPrivilegeElement(perm.getActionUri())); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]