| commit | 35afb7e085c7b9439f74e0dbfa1ef22d9ff2d388 | [log] [tgz] |
|---|---|---|
| author | Eric Norman <enorman@apache.org> | Wed Aug 14 05:28:14 2013 +0000 |
| committer | Eric Norman <enorman@apache.org> | Wed Aug 14 05:28:14 2013 +0000 |
| tree | 179f84e7ca1ba3d6f7b548b8c2ef44d7cfae255f | |
| parent | f88d8940fb037a78a1fc4ec8485883f746b9bbab [diff] |
SLING-3010 integrate patch from Anjan. Added integration tests to guard against future regressions. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1513729 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/jcr/base/util/AccessControlUtil.java b/src/main/java/org/apache/sling/jcr/base/util/AccessControlUtil.java index e0b6fc8..ada6e69 100644 --- a/src/main/java/org/apache/sling/jcr/base/util/AccessControlUtil.java +++ b/src/main/java/org/apache/sling/jcr/base/util/AccessControlUtil.java
@@ -484,6 +484,9 @@ if (privilege.isAggregate()) { Privilege[] privileges = privilege.getAggregatePrivileges(); for (Privilege disaggregate : privileges) { + if (disaggregate.isAggregate()) { + continue; //nested aggregate, so skip it since the privileges are already included. + } disaggregatedPrivilegeNames.add(disaggregate.getName()); } } else {