Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 72425 invoked from network); 3 Jan 2010 23:33:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Jan 2010 23:33:00 -0000 Received: (qmail 50012 invoked by uid 500); 3 Jan 2010 23:32:59 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 49955 invoked by uid 500); 3 Jan 2010 23:32:59 -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 49946 invoked by uid 99); 3 Jan 2010 23:32:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jan 2010 23:32:59 +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; Sun, 03 Jan 2010 23:32:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 131A02388A84; Sun, 3 Jan 2010 23:32:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r895509 - in /directory/shared/branches/shared-schema/ldap/src: main/java/org/apache/directory/shared/ldap/name/LdapDN.java test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java Date: Sun, 03 Jan 2010 23:32:36 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100103233239.131A02388A84@eris.apache.org> Author: seelmann Date: Sun Jan 3 23:32:34 2010 New Revision: 895509 URL: http://svn.apache.org/viewvc?rev=895509&view=rev Log: save upName to new ATAV Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java?rev=895509&r1=895508&r2=895509&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java (original) +++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java Sun Jan 3 23:32:34 2010 @@ -1502,15 +1502,17 @@ { String upValue = rdn.getUpValue(); String upType = rdn.getUpType(); + String upName = rdn.getUpName(); rdn.clear(); String normStringValue = DefaultStringNormalizer.normalizeString( ( String ) upValue ); String normValue = oidNormalizer.getNormalizer().normalize( normStringValue ); - rdn.addAttributeTypeAndValue( upType, oidNormalizer.getAttributeTypeOid(), - new ClientStringValue( upValue ), - new ClientStringValue( normValue ) ); + AttributeTypeAndValue atav = new AttributeTypeAndValue( upType, oidNormalizer.getAttributeTypeOid(), + new ClientStringValue( upValue ), new ClientStringValue( normValue ), upName ); + rdn.addAttributeTypeAndValue( atav ); } + /** * Transform a RDN by changing the value to its OID counterpart and * normalizing the value accordingly to its type. Modified: directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java?rev=895509&r1=895508&r2=895509&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java (original) +++ directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java Sun Jan 3 23:32:34 2010 @@ -3532,7 +3532,6 @@ assertEquals( "ou", atav.getUpType() ); assertEquals( "Example", atav.getUpValue().get() ); - // Wrong !!! TODO : fix me assertEquals( " ou = Example ", atav.getUpName() ); }