Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 73405 invoked from network); 9 Aug 2010 15:05:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Aug 2010 15:05:36 -0000 Received: (qmail 94660 invoked by uid 500); 9 Aug 2010 15:05:36 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 94585 invoked by uid 500); 9 Aug 2010 15:05:36 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 94578 invoked by uid 99); 9 Aug 2010 15:05:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Aug 2010 15:05:35 +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; Mon, 09 Aug 2010 15:05:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 44CCE23889B3; Mon, 9 Aug 2010 15:04:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r983672 - /activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java Date: Mon, 09 Aug 2010 15:04:16 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100809150416.44CCE23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Mon Aug 9 15:04:15 2010 New Revision: 983672 URL: http://svn.apache.org/viewvc?rev=983672&view=rev Log: Fixes AMQ-2863 : KahaDB NPE can occur using random index removes Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java URL: http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java?rev=983672&r1=983671&r2=983672&view=diff ============================================================================== --- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java (original) +++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java Mon Aug 9 15:04:15 2010 @@ -237,7 +237,7 @@ public final class BTreeNode private BTreeNode getRightLeaf(Transaction tx) throws IOException { BTreeNode cur = this; while(cur.isBranch()) { - cur = cur.getChild(tx, keys.length); + cur = cur.getChild(tx, cur.keys.length); } return cur; }