directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1754655 - /directory/apacheds/branches/apacheds-value/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
Date Sun, 31 Jul 2016 12:04:26 GMT
Author: elecharny
Date: Sun Jul 31 12:04:25 2016
New Revision: 1754655

URL: http://svn.apache.org/viewvc?rev=1754655&view=rev
Log:
Applied patch for DIRSERVER-2155

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

Modified: directory/apacheds/branches/apacheds-value/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-value/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1754655&r1=1754654&r2=1754655&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
(original)
+++ directory/apacheds/branches/apacheds-value/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
Sun Jul 31 12:04:25 2016
@@ -3630,6 +3630,12 @@ 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 );



Mime
View raw message