Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 11289 invoked from network); 19 Feb 2006 14:19:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Feb 2006 14:19:34 -0000 Received: (qmail 22164 invoked by uid 500); 19 Feb 2006 14:19:34 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 22106 invoked by uid 500); 19 Feb 2006 14:19:33 -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 22095 invoked by uid 99); 19 Feb 2006 14:19:33 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Feb 2006 06:19:33 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 19 Feb 2006 06:19:33 -0800 Received: (qmail 10464 invoked by uid 65534); 19 Feb 2006 14:19:12 -0000 Message-ID: <20060219141912.10463.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r378900 - /directory/sandbox/akarasulu/rc1/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java Date: Sun, 19 Feb 2006 14:19:12 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: elecharny Date: Sun Feb 19 06:19:11 2006 New Revision: 378900 URL: http://svn.apache.org/viewcvs?rev=378900&view=rev Log: Fixed a DN parsing error with OID in the NCs Modified: directory/sandbox/akarasulu/rc1/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java Modified: directory/sandbox/akarasulu/rc1/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java?rev=378900&r1=378899&r2=378900&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java (original) +++ directory/sandbox/akarasulu/rc1/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java Sun Feb 19 06:19:11 2006 @@ -34,6 +34,7 @@ import org.apache.directory.shared.ldap.codec.util.LdapStringEncodingException; import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.schema.OidNormalizer; +import org.apache.directory.shared.ldap.util.DNUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1093,6 +1094,11 @@ { String type = StringTools.trim( atav.getType() ); + if ( ( type.startsWith( "oid." ) ) || ( type.startsWith( "OID." ) ) ) + { + type = type.substring( 4 ); + } + if ( StringTools.isNotEmpty( StringTools.lowerCase( type ) ) ) { OidNormalizer oidNormalizer = ( OidNormalizer ) oids.get( type ); @@ -1153,6 +1159,11 @@ else { String type = StringTools.trim( rdn.getType() ); + + if ( ( type.startsWith( "oid." ) ) || ( type.startsWith( "OID." ) ) ) + { + type = type.substring( 4 ); + } if ( StringTools.isNotEmpty( StringTools.lowerCase( type ) ) ) {