From b5093b49fb352f3586207cb4cb0364780725e64c Mon Sep 17 00:00:00 2001 From: Sergey Soldatov Date: Tue, 24 May 2016 02:35:48 -0700 Subject: [PATCH] HBASE-15884 NPE in StoreFileScanner during reverse scan --- .../java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java index abade0e..4955ffe 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java @@ -253,9 +253,9 @@ public class StoreFileScanner implements KeyValueScanner { while(enforceMVCC && cur != null && (cur.getSequenceId() > readPt)) { - hfs.next(); + boolean hasNext = hfs.next(); setCurrentCell(hfs.getCell()); - if (this.stopSkippingKVsIfNextRow + if (hasNext && this.stopSkippingKVsIfNextRow && getComparator().compareRows(cur, startKV) > 0) { return false; } -- 2.5.4 (Apple Git-61)