commit 7391447b3cee132bbcc9a023f435919025c28511
author Emmanuel Lécharny <elecharny@apache.org> Sun Jul 31 12:01:06 2016 +0000
committer Emmanuel Lécharny <elecharny@apache.org> Sun Jul 31 12:01:06 2016 +0000
tree 7403edc19b2166441f10a485da5f024abeccd104
parent cf148767ea2cbe3778a685d7fbc472260e463261

Fix for DIRSERVER-2155


git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/trunk@1754654 13f79535-47bb-0310-9956-ffa450edef68

xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java

diff --git a/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java b/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
index 05e8100..a9edbfe 100644
--- a/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
+++ b/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
@@ -3403,6 +3403,11 @@
             String contextEntryId = getEntryId( getSuffixDn() );
             Entry origEntry = fetch( contextEntryId );
             
+            // The Context Entry may have been deleted. Get out if we don't find it
+            if ( origEntry == null )
+            {
+                return;
+            }
             origEntry = ( ( ClonedServerEntry ) origEntry ).getOriginalEntry();
             
             origEntry.removeAttributes( contextCsnAT, entryDnAT );