svn commit: r1541025 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java

[angela]

Author: angela
Date: Tue Nov 12 12:10:14 2013
New Revision: 1541025

URL: http://svn.apache.org/r1541025
Log:
minor improvement

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java?rev=1541025&r1=1541024&r2=1541025&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
 Tue Nov 12 12:10:14 2013
@@ -186,10 +186,8 @@ class UserValidator extends DefaultValid
         MembershipProvider mp = provider.getMembershipProvider();
         for (String memberContentId : memberRefs) {
             Tree memberTree = mp.getByContentID(memberContentId, 
AuthorizableType.GROUP);
-            if (memberTree != null) {
-                if (mp.isCyclicMembership(memberTree, groupContentId)) {
-                    throw constraintViolation(31, "Cyclic group membership 
detected in group" + UserUtil.getAuthorizableId(parentAfter));
-                }
+            if (memberTree != null && mp.isCyclicMembership(memberTree, 
groupContentId)) {
+                throw constraintViolation(31, "Cyclic group membership 
detected in group" + UserUtil.getAuthorizableId(parentAfter));
             }
         }
     }