Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 65B929653 for ; Fri, 4 May 2012 08:30:45 +0000 (UTC) Received: (qmail 94515 invoked by uid 500); 4 May 2012 08:30:45 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 94479 invoked by uid 500); 4 May 2012 08:30:44 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 94469 invoked by uid 99); 4 May 2012 08:30:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2012 08:30:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2012 08:30:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4C26823888CD; Fri, 4 May 2012 08:30:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1333811 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImpl.java Date: Fri, 04 May 2012 08:30:21 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120504083021.4C26823888CD@eris.apache.org> Author: angela Date: Fri May 4 08:30:20 2012 New Revision: 1333811 URL: http://svn.apache.org/viewvc?rev=1333811&view=rev Log: OAK-50 : User management (WIP) Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImpl.java Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImpl.java?rev=1333811&r1=1333810&r2=1333811&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImpl.java Fri May 4 08:30:20 2012 @@ -108,24 +108,25 @@ class GroupImpl extends AuthorizableImpl log.warn("Invalid Authorizable: {}", authorizable); return false; } - if (isEveryone() || ((AuthorizableImpl) authorizable).isEveryone()) { - return false; - } - AuthorizableImpl authImpl = ((AuthorizableImpl) authorizable); - Node memberNode = authImpl.getNode(); - if (memberNode.isSame(getNode())) { - String msg = "Attempt to add a group as member of itself (" + getID() + ")."; - log.warn(msg); + AuthorizableImpl authorizableImpl = ((AuthorizableImpl) authorizable); + if (isEveryone() || authorizableImpl.isEveryone()) { return false; } - if (authImpl.isGroup() && ((GroupImpl) authImpl).isMember(this)) { - log.warn("Attempt to create circular group membership."); - return false; + if (authorizableImpl.isGroup()) { + if (getID().equals(authorizableImpl.getID())) { + String msg = "Attempt to add a group as member of itself (" + getID() + ")."; + log.warn(msg); + return false; + } + if (((Group) authorizableImpl).isMember(this)) { + log.warn("Attempt to create circular group membership."); + return false; + } } - return getUserManager().getMembershipManager().addMember(this, authImpl); + return getUserManager().getMembershipManager().addMember(this, authorizableImpl); } /**