Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 31128 invoked from network); 14 Dec 2009 19:11:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Dec 2009 19:11:02 -0000 Received: (qmail 58509 invoked by uid 500); 14 Dec 2009 19:11:01 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 58469 invoked by uid 500); 14 Dec 2009 19:11:01 -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 58434 invoked by uid 99); 14 Dec 2009 19:11:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Dec 2009 19:11: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; Mon, 14 Dec 2009 19:10:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A87CE23888D1; Mon, 14 Dec 2009 19:10:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r890445 - in /directory/shared/branches/shared-schema/ldap-schema-loader/src: main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java Date: Mon, 14 Dec 2009 19:10:32 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091214191038.A87CE23888D1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Dec 14 19:10:25 2009 New Revision: 890445 URL: http://svn.apache.org/viewvc?rev=890445&view=rev Log: o Fixed the deletion for C/N/SC schemaObject o Enabled the associated test Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java?rev=890445&r1=890444&r2=890445&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java (original) +++ directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java Mon Dec 14 19:10:25 2009 @@ -1413,6 +1413,22 @@ return false; } + + + /** + * Get the inner SchemaObject if it's not a C/N/SC + */ + private SchemaObject getSchemaObject( SchemaObject schemaObject ) throws NamingException + { + if ( registries.getGlobalOidRegistry().hasOid( schemaObject.getOid() ) ) + { + return registries.getGlobalOidRegistry().getSchemaObject( schemaObject.getOid() ); + } + else + { + return schemaObject; + } + } /** @@ -1609,8 +1625,8 @@ return false; } - // Build the new AttributeType from the given entry - SchemaObject toDelete = registries.getGlobalOidRegistry().getSchemaObject( schemaObject.getOid() ); + // Get the SchemaObject to delete if it's not a LoadableSchemaObject + SchemaObject toDelete = getSchemaObject( schemaObject ); // First check that this SchemaObject does not have any referencing SchemaObjects Set referencing = registries.getReferencing( toDelete ); Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java?rev=890445&r1=890444&r2=890445&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java (original) +++ directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java Mon Dec 14 19:10:25 2009 @@ -42,7 +42,6 @@ import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; @@ -256,7 +255,7 @@ // Comparator deletion tests //------------------------------------------------------------------------- - @Ignore("lookup of newly added comparator is failing") + //@Ignore("lookup of newly added comparator is failing") @Test public void testDeleteExistingComaparator() throws Exception {