Return-Path: 
 <commits-return-27465-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 36744 invoked from network); 18 Sep 2010 16:50:54 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 18 Sep 2010 16:50:54 -0000
Received: (qmail 56807 invoked by uid 500); 18 Sep 2010 16:50:54 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 56750 invoked by uid 500); 18 Sep 2010 16:50:54 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 56743 invoked by uid 99); 18 Sep 2010 16:50:54 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Sep 2010 16:50:54 +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; Sat, 18 Sep 2010 16:50:51 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 339B32388A38; Sat, 18 Sep 2010 16:50:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r998495 -
 /directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
Date: Sat, 18 Sep 2010 16:50:30 -0000
To: commits@directory.apache.org
From: kayyagari@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100918165030.339B32388A38@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kayyagari
Date: Sat Sep 18 16:50:29 2010
New Revision: 998495

URL: http://svn.apache.org/viewvc?rev=998495&view=rev
Log:
o added a check to preven adding an existing entry (this check is useful only when a partition is not fronted by  interceptor chain, by default this check is disabled)

Modified:
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=998495&r1=998494&r2=998495&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Sat Sep 18 16:50:29 2010
@@ -137,6 +137,13 @@ public abstract class AbstractStore<E, I
     /** the relative distinguished name index */
     protected Index<ParentIdAndRdn<ID>, E, ID> rdnIdx;
 
+    /**
+     * a flag to enable/disable hasEntry() check before adding the entry
+     * Note: This kind of check is already present in ExceptionInterceptor's
+     * add() method. This flag needs to be enabled only in cases where interceptor chain
+     * is not used or not yet effective at the time of adding entries into this store.
+     */
+    private boolean checkHasEntryDuringAdd = true;
 
     public void init( SchemaManager schemaManager ) throws Exception
     {
@@ -847,6 +854,19 @@ public abstract class AbstractStore<E, I
             throw new Exception( I18n.err( I18n.ERR_215 ) );
         }
 
+        DN entryDn = entry.getDn();
+
+        if ( checkHasEntryDuringAdd )
+        {
+            // check if the entry already exists
+            if ( getEntryId( entryDn ) != null )
+            {
+                LdapEntryAlreadyExistsException ne = new LdapEntryAlreadyExistsException(
+                    I18n.err( I18n.ERR_250_ENTRY_ALREADY_EXISTS, entryDn.getName() ) );
+                throw ne;
+            }
+        }
+
         ID parentId;
         ID id = master.getNextId( entry );
 
@@ -855,7 +875,6 @@ public abstract class AbstractStore<E, I
         // capped off using the zero value which no entry can have since
         // entry sequences start at 1.
         //
-        DN entryDn = entry.getDn();
         DN parentDn = null;
         ParentIdAndRdn<ID> key = null;
 
@@ -2142,4 +2161,24 @@ public abstract class AbstractStore<E, I
         entryCsnIdx.drop( id );
         entryCsnIdx.add( entry.get( SchemaConstants.ENTRY_CSN_AT ).getString(), id );
     }
+
+    
+    /**
+     * @return true if the hasEntry check is performed before adding a entry, false otherwise
+     */
+    public boolean isCheckHasEntryDuringAdd()
+    {
+        return checkHasEntryDuringAdd;
+    }
+
+    
+    /**
+     * set the flag to nable/disable checking of entry existence before actually adding it
+     * @param checkHasEntryDuringAdd
+     */
+    public void setCheckHasEntryDuringAdd( boolean checkHasEntryDuringAdd )
+    {
+        this.checkHasEntryDuringAdd = checkHasEntryDuringAdd;
+    }
+    
 }