Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 34925 invoked from network); 6 Aug 2006 17:16:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Aug 2006 17:16:02 -0000 Received: (qmail 71100 invoked by uid 500); 6 Aug 2006 17:16:01 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 71038 invoked by uid 500); 6 Aug 2006 17:16: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 71027 invoked by uid 99); 6 Aug 2006 17:16:01 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Aug 2006 10:16:01 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Aug 2006 10:16:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EAFBF1A981A; Sun, 6 Aug 2006 10:15:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r429156 - /directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java Date: Sun, 06 Aug 2006 17:15:40 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060806171540.EAFBF1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Sun Aug 6 10:15:39 2006 New Revision: 429156 URL: http://svn.apache.org/viewvc?rev=429156&view=rev Log: fix for DIRSERVER-643: adding entry ith two attributes of same type does not combine Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java?rev=429156&r1=429155&r2=429156&view=diff ============================================================================== --- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java (original) +++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java Sun Aug 6 10:15:39 2006 @@ -142,6 +142,13 @@ */ public void addAttributeType( LdapString type ) { + // do not create a new attribute if we have seen this attributeType before + if ( attributes.get( type.toString().toLowerCase() ) != null ) + { + return; + } + + // fix this to use LockableAttributeImpl(type.getString().toLowerCase()) currentAttribute = new BasicAttribute( type.getString().toLowerCase() ); attributes.put( currentAttribute ); } @@ -154,6 +161,13 @@ */ public void addAttributeType( String type ) { + // do not create a new attribute if we have seen this attributeType before + if ( attributes.get( type.toLowerCase() ) != null ) + { + return; + } + + // fix this to use LockableAttributeImpl(type.getString().toLowerCase()) currentAttribute = new BasicAttribute( type.toLowerCase() ); attributes.put( currentAttribute ); }