From commits-return-26793-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Aug 04 09:17:58 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 11345 invoked from network); 4 Aug 2010 09:17:58 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Aug 2010 09:17:58 -0000 Received: (qmail 94816 invoked by uid 500); 4 Aug 2010 09:17:58 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 94753 invoked by uid 500); 4 Aug 2010 09:17:57 -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 94744 invoked by uid 99); 4 Aug 2010 09:17:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Aug 2010 09:17:56 +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; Wed, 04 Aug 2010 09:17:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E519A23889BB; Wed, 4 Aug 2010 09:16:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r982171 - in /directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi: ServerContext.java ServerDirContext.java Date: Wed, 04 Aug 2010 09:16:36 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100804091636.E519A23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Wed Aug 4 09:16:35 2010 New Revision: 982171 URL: http://svn.apache.org/viewvc?rev=982171&view=rev Log: o fixed an issue related to the values used after normalizing the DN o fixed an issue related to adding user provided values Modified: 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 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=982171&r1=982170&r2=982171&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 Wed Aug 4 09:16:35 2010 @@ -756,7 +756,7 @@ public abstract class ServerContext impl if ( rdn != null ) { - if ( SchemaConstants.CN_AT.equals( rdn.getNormType() ) ) + if ( SchemaConstants.CN_AT_OID.equals( rdn.getNormType() ) ) { serverEntry.put( rdn.getUpType(), rdn.getUpValue() ); } @@ -1561,6 +1561,7 @@ public abstract class ServerContext impl // Add to left hand side of cloned DN the relative name arg try { + relativeName.normalize( schemaManager.getNormalizerMapping() ); target = target.addAllNormalized( target.size(), relativeName ); } catch (LdapInvalidDnException lide ) 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=982171&r1=982170&r2=982171&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 Wed Aug 4 09:16:35 2010 @@ -575,7 +575,7 @@ public abstract class ServerDirContext e if ( rdn.size() == 1 ) { String rdnAttribute = rdn.getUpType(); - String rdnValue = rdn.getNormValue().getString(); + String rdnValue = rdn.getUpValue().getString(); // Add the RDN attribute boolean doRdnPut = attributes.get( rdnAttribute ) == null; @@ -604,7 +604,7 @@ public abstract class ServerDirContext e if ( doRdnPut ) { - attributes.put( atav.getNormType(), atav.getNormValue().get() ); + attributes.put( atav.getNormType(), atav.getUpValue().get() ); } } }