Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 8221 invoked from network); 23 Nov 2010 22:11:29 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Nov 2010 22:11:29 -0000 Received: (qmail 18498 invoked by uid 500); 23 Nov 2010 22:12:01 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 18464 invoked by uid 500); 23 Nov 2010 22:12: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 18457 invoked by uid 99); 23 Nov 2010 22:12:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Nov 2010 22:12: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; Tue, 23 Nov 2010 22:12:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BD151238890D; Tue, 23 Nov 2010 22:10:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1038360 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/schema/ core/src/main/java/org/apache/directory/server/core/changelog/ core/src/main/java/org/apache/directory/server/core/schema/ Date: Tue, 23 Nov 2010 22:10:29 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101123221029.BD151238890D@eris.apache.org> Author: seelmann Date: Tue Nov 23 22:10:29 2010 New Revision: 1038360 URL: http://svn.apache.org/viewvc?rev=1038360&view=rev Log: Avoid convertion from DN to String to DN Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=1038360&r1=1038359&r2=1038360&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Tue Nov 23 22:10:29 2010 @@ -3,6 +3,7 @@ package org.apache.directory.server.core import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; @@ -12,11 +13,11 @@ public interface SchemaService /** * Tells if the given DN is the schemaSubentry DN * - * @param dnString The DN we want to check + * @param dn The DN we want to check * @return true if the given DN is the Schema subentry DN * @throws LdapException If the given DN is not valid */ - boolean isSchemaSubentry( String dnString ) throws LdapException; + boolean isSchemaSubentry( DN dn ) throws LdapException; /** @@ -66,4 +67,4 @@ public interface SchemaService * @throws Exception if there are failures during schema info access */ Entry getSubschemaEntry( String[] ids ) throws LdapException; -} \ No newline at end of file +} Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=1038360&r1=1038359&r2=1038360&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Tue Nov 23 22:10:29 2010 @@ -198,7 +198,7 @@ public class ChangeLogInterceptor extend Entry serverEntry; // @todo make sure we're not putting in operational attributes that cannot be user modified - if ( schemaService.isSchemaSubentry( dn.getNormName() ) ) + if ( schemaService.isSchemaSubentry( dn ) ) { return schemaService.getSubschemaEntryCloned(); } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=1038360&r1=1038359&r2=1038360&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Tue Nov 23 22:10:29 2010 @@ -79,18 +79,11 @@ public class DefaultSchemaService implem - /* (non-Javadoc) - * @see org.apache.directory.server.core.schema.SchemaService#isSchemaSubentry(java.lang.String) + /** + * {@inheritDoc} */ - public boolean isSchemaSubentry( String dnString ) throws LdapException + public boolean isSchemaSubentry( DN dn ) throws LdapException { - if ( ServerDNConstants.CN_SCHEMA_DN.equalsIgnoreCase( dnString ) || - ServerDNConstants.CN_SCHEMA_DN_NORMALIZED.equalsIgnoreCase( dnString ) ) - { - return true; - } - - DN dn = DNFactory.create( dnString, schemaPartition.getSchemaManager() ); return dn.getNormName().equals( ServerDNConstants.CN_SCHEMA_DN_NORMALIZED ); }