From 047448464be2abced6e566f43fd773fb5e4f39d8 Mon Sep 17 00:00:00 2001
From: Raghuram Devarakonda <draghuram@gmail.com>
Date: Fri, 16 Nov 2012 14:23:56 -0500
Subject: [PATCH] SEC-2140: Correct javadoc order of security checkes for
 AclAuthorizationStrategyImpl

---
 .../acls/domain/AclAuthorizationStrategyImpl.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java
index 35ceed5c8c..4954d40042 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java
@@ -31,10 +31,14 @@ import org.springframework.util.Assert;
 /**
  * Default implementation of {@link AclAuthorizationStrategy}.
  * <p>
- * Permission will be granted provided the current principal is either the owner (as defined by the ACL), has
- * {@link BasePermission#ADMINISTRATION} (as defined by the ACL and via a {@link Sid} retrieved for the current
- * principal via {@link #sidRetrievalStrategy}), or if the current principal holds the relevant system-wide
- * {@link GrantedAuthority} and injected into the constructor.
+ * Permission will be granted if at least one of the following conditions is true for the current 
+ * principal. 
+ * <ul>
+ * <li> is the owner (as defined by the ACL). </li>
+ * <li> holds the relevant system-wide {@link GrantedAuthority} injected into the 
+ *      constructor. </li>
+ * <li> has {@link BasePermission#ADMINISTRATION} permission (as defined by the ACL). </li>
+ * </ul>
  *
  * @author Ben Alex
  */