svn commit: r983672 - /activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java

[chirino]

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<Key,Value> 
     private BTreeNode<Key,Value> getRightLeaf(Transaction tx) throws 
IOException {
         BTreeNode<Key,Value> cur = this;
         while(cur.isBranch()) {
-            cur = cur.getChild(tx, keys.length);
+            cur = cur.getChild(tx, cur.keys.length);
         }
         return cur;
     }