pnever 2004/08/12 09:52:46
Modified: src/webdav/server/org/apache/slide/webdav/util Tag:
SLIDE_2_0_RELEASE_BRANCH PropertyHelper.java
Log:
Takeover fix by James Mason to RELEASE_2_0 branch as well:
"Fixed generation of acl property to make a new ace when the value of
"inheritedFrom" changes."
Revision Changes Path
No revision
No revision
1.63.2.7 +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.63.2.6
retrieving revision 1.63.2.7
diff -u -r1.63.2.6 -r1.63.2.7
--- PropertyHelper.java 18 Jun 2004 16:07:11 -0000 1.63.2.6
+++ PropertyHelper.java 12 Aug 2004 16:52:46 -0000 1.63.2.7
@@ -1698,13 +1698,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) {
@@ -1743,6 +1745,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]
