HBASE-2797 Another NPE in ReadWriteConsistencyControl

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@961549 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -429,6 +429,7 @@ Release 0.21.0 - Unreleased
    HBASE-2806  DNS hiccups cause uncaught NPE in HServerAddress#getBindAddress
                (Benoit Sigoure via Stack)
    HBASE-2806  (small compile fix via jgray)
+   HBASE-2797  Another NPE in ReadWriteConsistencyControl
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java

@@ -169,15 +169,9 @@ class StoreScanner implements KeyValueScanner, InternalScanner, ChangedReadersOb
   }
 
   public synchronized KeyValue peek() {
-    try {
-      checkReseek();
-    } catch (IOException e) {
-      throw new RuntimeException("IOE conversion", e);
-    }
     if (this.heap == null) {
-      return null;
+      return this.lastTop;
     }
-
     return this.heap.peek();
   }
 

src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java

@@ -452,6 +452,8 @@ public class TestStoreScanner extends TestCase {
     scan.updateReaders();
 
     scan.updateReaders();
+
+    scan.peek();
   }