Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 66135 invoked from network); 16 Dec 2009 17:06:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Dec 2009 17:06:55 -0000 Received: (qmail 63806 invoked by uid 500); 16 Dec 2009 17:06:55 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 63746 invoked by uid 500); 16 Dec 2009 17:06:55 -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 63737 invoked by uid 99); 16 Dec 2009 17:06:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2009 17:06:55 +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, 16 Dec 2009 17:06:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B830923889E7; Wed, 16 Dec 2009 17:06:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r891319 - /directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java Date: Wed, 16 Dec 2009 17:06:32 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091216170632.B830923889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed Dec 16 17:06:32 2009 New Revision: 891319 URL: http://svn.apache.org/viewvc?rev=891319&view=rev Log: Fixed a bug in the cloning of ServerEntries :we could get some NPE in some corner cases Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java?rev=891319&r1=891318&r2=891319&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java (original) +++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java Wed Dec 16 17:06:32 2009 @@ -2282,10 +2282,10 @@ // now clone all the servrAttributes clone.attributes.clear(); - for ( AttributeType key:attributes.keySet() ) + for ( EntryAttribute entryAttribute : attributes.values() ) { - EntryAttribute value = (ServerAttribute)attributes.get( key ).clone(); - clone.attributes.put( key, value ); + ServerAttribute value = (ServerAttribute)entryAttribute.clone(); + clone.attributes.put( value.getAttributeType(), value ); } // We are done !