You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@directory.apache.org by el...@apache.org on 2016/07/31 12:01:07 UTC

svn commit: r1754654 - /directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java

Author: elecharny
Date: Sun Jul 31 12:01:06 2016
New Revision: 1754654

URL: http://svn.apache.org/viewvc?rev=1754654&view=rev
Log:
Fix for DIRSERVER-2155

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

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1754654&r1=1754653&r2=1754654&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Sun Jul 31 12:01:06 2016
@@ -3403,6 +3403,11 @@ public abstract class AbstractBTreeParti
             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 );