Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 10595 invoked from network); 25 Mar 2011 01:10:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Mar 2011 01:10:18 -0000 Received: (qmail 28748 invoked by uid 500); 25 Mar 2011 01:10:18 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 28713 invoked by uid 500); 25 Mar 2011 01:10:18 -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 28706 invoked by uid 99); 25 Mar 2011 01:10:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Mar 2011 01:10:18 +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, 25 Mar 2011 01:10:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D869C23888FD; Fri, 25 Mar 2011 01:09:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1085232 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/schema/ core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ core-jndi/src/main/java/org/apache/directory/s... Date: Fri, 25 Mar 2011 01:09:55 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110325010955.D869C23888FD@eris.apache.org> Author: elecharny Date: Fri Mar 25 01:09:55 2011 New Revision: 1085232 URL: http://svn.apache.org/viewvc?rev=1085232&view=rev Log: Replaced some methods by other more accurate Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=1085232&r1=1085231&r2=1085232&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Fri Mar 25 01:09:55 2011 @@ -484,6 +484,7 @@ public class SchemaPartitionDaoImpl impl public String findSchema( String entityName ) throws Exception { Dn dn = findDn( entityName ); + if ( dn == null ) { return null; Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=1085232&r1=1085231&r2=1085232&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Fri Mar 25 01:09:55 2011 @@ -157,6 +157,7 @@ public abstract class AbstractRegistrySy } Rdn rdn = dn.getRdn( 1 ); + return rdn.getNormValue().getString(); } Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1085232&r1=1085231&r2=1085232&view=diff ============================================================================== --- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original) +++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Fri Mar 25 01:09:55 2011 @@ -1028,7 +1028,7 @@ public abstract class ServerContext impl private void injectRdnAttributeValues( Dn target, Entry serverEntry ) throws NamingException { // Add all the Rdn attributes and their values to this entry - Rdn rdn = target.getRdn( target.size() - 1 ); + Rdn rdn = target.getRdn(); if ( rdn.size() == 1 ) { Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=1085232&r1=1085231&r2=1085232&view=diff ============================================================================== --- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original) +++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Fri Mar 25 01:09:55 2011 @@ -566,7 +566,7 @@ public abstract class ServerDirContext e } Dn target = buildTarget( JndiUtils.fromName( name ) ); - Rdn rdn = target.getRdn( target.size() - 1 ); + Rdn rdn = target.getRdn(); attrs = AttributeUtils.toCaseInsensitive( attrs ); Attributes attributes = ( Attributes ) attrs.clone(); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1085232&r1=1085231&r2=1085232&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Fri Mar 25 01:09:55 2011 @@ -794,8 +794,8 @@ public class DefaultDirectoryService imp Dn newBase = newDn.getParent(); // Compute the Rdn for each of the Dn - Rdn newRdn = newDn.getRdn( newDn.size() - 1 ); - Rdn oldRdn = oldDn.getRdn( oldDn.size() - 1 ); + Rdn newRdn = newDn.getRdn(); + Rdn oldRdn = oldDn.getRdn(); /* * We need to determine if this rename operation corresponds to a simple Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1085232&r1=1085231&r2=1085232&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Fri Mar 25 01:09:55 2011 @@ -540,6 +540,7 @@ public class OperationalAttributeInterce for ( int ii = 0; ii < dn.size(); ii++ ) { Rdn rdn = dn.getRdn( ii ); + if ( rdn.size() == 0 ) { newDn = newDn.add( new Rdn() ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1085232&r1=1085231&r2=1085232&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Fri Mar 25 01:09:55 2011 @@ -1546,6 +1546,7 @@ public class SchemaInterceptor extends B } Rdn rdn = dn.getRdn( 1 ); + return rdn.getNormValue().getString(); }