Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 29185 invoked from network); 4 Jun 2010 16:36:02 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Jun 2010 16:36:02 -0000 Received: (qmail 41907 invoked by uid 500); 4 Jun 2010 16:36:02 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 41848 invoked by uid 500); 4 Jun 2010 16:36: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 41828 invoked by uid 99); 4 Jun 2010 16:36:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jun 2010 16:36:02 +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; Fri, 04 Jun 2010 16:36:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1FE2223889B6; Fri, 4 Jun 2010 16:35:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r951481 - in /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries: DefaultAttributeTypeRegistry.java DefaultObjectClassRegistry.java Date: Fri, 04 Jun 2010 16:35:39 -0000 To: commits@directory.apache.org From: felixk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100604163539.1FE2223889B6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: felixk Date: Fri Jun 4 16:35:38 2010 New Revision: 951481 URL: http://svn.apache.org/viewvc?rev=951481&view=rev Log: Removing from maps will need the key and not the value to get the wanted entry removed Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultAttributeTypeRegistry.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultObjectClassRegistry.java Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultAttributeTypeRegistry.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultAttributeTypeRegistry.java?rev=951481&r1=951480&r2=951481&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultAttributeTypeRegistry.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultAttributeTypeRegistry.java Fri Jun 4 16:35:38 2010 @@ -178,7 +178,7 @@ public class DefaultAttributeTypeRegistr if ( descendants.size() == 0 ) { - oidToDescendantSet.remove( descendants ); + oidToDescendantSet.remove( ancestor.getOid() ); } } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultObjectClassRegistry.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultObjectClassRegistry.java?rev=951481&r1=951480&r2=951481&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultObjectClassRegistry.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultObjectClassRegistry.java Fri Jun 4 16:35:38 2010 @@ -163,7 +163,7 @@ public class DefaultObjectClassRegistry if ( descendants.size() == 0 ) { - oidToDescendants.remove( descendants ); + oidToDescendants.remove( ancestor.getOid() ); } }