Index: pom.xml =================================================================== --- pom.xml (revision 1393854) +++ pom.xml (working copy) @@ -1491,6 +1491,21 @@ + + maven-javadoc-plugin + 2.6.1 + + true + + + + prepare-package + + javadoc + + + + Index: src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (revision 1393854) +++ src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (working copy) @@ -529,8 +529,10 @@ @Override public synchronized boolean reseek(KeyValue kv) throws IOException { - //Heap cannot be null, because this is only called from next() which - //guarantees that heap will never be null before this call. + //Heap will not be null, if this is called from next() which. + //If called from RegionScanner.reseek(...) make sure that scanner + //stack is reset if needed. + checkReseek(); if (explicitColumnQuery && lazySeekEnabledGlobally) { return heap.requestSeek(kv, true, useRowColBloom); } else {