From f4406121af4ff600d2ff581e5dbe46ec34b06cca Mon Sep 17 00:00:00 2001 From: Jean-Daniel Cryans Date: Mon, 28 Dec 2009 18:41:02 +0000 Subject: [PATCH] HBASE-2026 NPE in StoreScanner on compaction git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@894219 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + .../org/apache/hadoop/hbase/regionserver/StoreScanner.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index ce1b7f44ba7..36591df2713 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -139,6 +139,7 @@ Release 0.21.0 - Unreleased its regions around HBASE-2065 Cannot disable a table if any of its region is opening at the same time + HBASE-2026 NPE in StoreScanner on compaction IMPROVEMENTS HBASE-1760 Cleanup TODOs in HTable diff --git a/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java index b9746a2126d..d3043251629 100644 --- a/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java @@ -255,6 +255,7 @@ class StoreScanner implements KeyValueScanner, InternalScanner, ChangedReadersOb // Reset the state of the Query Matcher and set to top row matcher.reset(); - matcher.setRow(heap.peek().getRow()); + KeyValue kv = heap.peek(); + matcher.setRow((kv == null ? topKey : kv).getRow()); } } \ No newline at end of file