Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B2271200B55 for ; Sun, 31 Jul 2016 14:04:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B0AFD160A6C; Sun, 31 Jul 2016 12:04:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 03C97160A66 for ; Sun, 31 Jul 2016 14:04:30 +0200 (CEST) Received: (qmail 39282 invoked by uid 500); 31 Jul 2016 12:04:29 -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 39273 invoked by uid 99); 31 Jul 2016 12:04:29 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Jul 2016 12:04:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 83FEAC34BE for ; Sun, 31 Jul 2016 12:04:29 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.287 X-Spam-Level: X-Spam-Status: No, score=-0.287 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.287] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id aJ0ZkvgkSDHh for ; Sun, 31 Jul 2016 12:04:29 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 62CFB5FB8F for ; Sun, 31 Jul 2016 12:04:28 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 72A6EE019B for ; Sun, 31 Jul 2016 12:04:27 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 87A8B3A01DD for ; Sun, 31 Jul 2016 12:04:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160731120426.87A8B3A01DD@svn01-us-west.apache.org> archived-at: Sun, 31 Jul 2016 12:04:31 -0000 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 );