Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 86487 invoked from network); 8 Jul 2010 12:10:04 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Jul 2010 12:10:04 -0000 Received: (qmail 11689 invoked by uid 500); 8 Jul 2010 12:10:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 11619 invoked by uid 500); 8 Jul 2010 12:10:02 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 11586 invoked by uid 99); 8 Jul 2010 12:10:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jul 2010 12:10:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 08 Jul 2010 12:09:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5F27B23889D2; Thu, 8 Jul 2010 12:08:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r961725 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java Date: Thu, 08 Jul 2010 12:08:35 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100708120835.5F27B23889D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu Jul 8 12:08:35 2010 New Revision: 961725 URL: http://svn.apache.org/viewvc?rev=961725&view=rev Log: Fixed the javadoc : the DNs are the subentry's DN, not the AP's DNs Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java?rev=961725&r1=961724&r2=961725&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java Thu Jul 8 12:08:35 2010 @@ -74,27 +74,27 @@ public class SubentryCache /** - * Retrieve a Subentry given a AP DN. If there is none, null will be returned. + * Retrieve a Subentry given a DN. If there is none, null will be returned. * - * @param apDn The AdministrativePoint we want to get the Subentry for + * @param dn The DN we want to get the Subentry for * @return The found Subentry, or null */ - final Subentry getSubentry( DN apDn ) + final Subentry getSubentry( DN dn ) { - return cache.get( apDn.getNormName() ); + return cache.get( dn.getNormName() ); } /** - * Remove a Subentry for a given AdministrativePoint + * Remove a Subentry for a given DN * - * @param apDn The administrativePoint for which we want to remove the + * @param dn The DN for which we want to remove the * associated Subentry * @return The removed Subentry, if any */ - final Subentry removeSubentry( DN apDn ) + final Subentry removeSubentry( DN dn ) { - Subentry oldSubentry = cache.remove( apDn.getNormName() ); + Subentry oldSubentry = cache.remove( dn.getNormName() ); if ( oldSubentry != null ) { @@ -106,26 +106,26 @@ public class SubentryCache /** - * Stores a new Subentry into the cache, associated with an AdministrativePoint + * Stores a new Subentry into the cache, associated with a DN * - * @param apDn The administrativePoint DN + * @param dn The Subentry DN * @param ss The SubtreeSpecification * @param adminRoles The administrative roles for this Subentry * @return The old Subentry, if any */ - final Subentry addSubentry( DN apDn, SubtreeSpecification ss, Set adminRoles ) + final Subentry addSubentry( DN dn, SubtreeSpecification ss, Set adminRoles ) { if ( cacheSize.get() > cacheMaxSize ) { // TODO : Throw an exception here } - Subentry oldSubentry = cache.get( apDn.getNormName() ); + Subentry oldSubentry = cache.get( dn.getNormName() ); Subentry subentry = new Subentry(); subentry.setSubtreeSpecification( ss ); subentry.setAdministrativeRoles( adminRoles ); - cache.put( apDn.getNormName(), subentry ); + cache.put( dn.getNormName(), subentry ); if ( oldSubentry == null ) { @@ -137,18 +137,18 @@ public class SubentryCache /** - * Tells if there is a Subentry associated with an administrativePoint - * @param apDn The administrativePoint DN + * Tells if there is a Subentry associated with a DN + * @param dn The DN * @return True if a Subentry is found */ - final boolean hasSubentry( DN apDn ) + final boolean hasSubentry( DN dn ) { - return cache.containsKey( apDn.getNormName() ); + return cache.containsKey( dn.getNormName() ); } /** - * @return An Iterator over the AdministartivePoints normalized DNs + * @return An Iterator over the Subentry's DNs */ final Iterator nameIterator() {