From commits-return-34462-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Mon Sep 10 22:51:12 2012 Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 44D49D37D for ; Mon, 10 Sep 2012 22:51:12 +0000 (UTC) Received: (qmail 32929 invoked by uid 500); 10 Sep 2012 22:51:12 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 32856 invoked by uid 500); 10 Sep 2012 22:51:11 -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 32849 invoked by uid 99); 10 Sep 2012 22:51:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2012 22:51:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 10 Sep 2012 22:51:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 06EFE23889E2 for ; Mon, 10 Sep 2012 22:50:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1383146 - /directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Date: Mon, 10 Sep 2012 22:50:25 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120910225026.06EFE23889E2@eris.apache.org> Author: elecharny Date: Mon Sep 10 22:50:25 2012 New Revision: 1383146 URL: http://svn.apache.org/viewvc?rev=1383146&view=rev Log: Only update the DN of an entry when it is not already set. Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1383146&r1=1383145&r2=1383146&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Mon Sep 10 22:50:25 2012 @@ -1171,8 +1171,11 @@ public abstract class AbstractBTreeParti if ( entry != null ) { - // We have to store the DN in this entry - entry.setDn( dn ); + // We have to store the DN in this entry, if it has no DN yet + if ( !dn.equals( entry.getDn() ) ) + { + entry.setDn( dn ); + } return new ClonedServerEntry( entry ); }