From 32a380b12adafc7656c002a9f11181d5861c60c8 Mon Sep 17 00:00:00 2001 From: Ryan Rawson Date: Mon, 15 Jun 2009 06:44:08 +0000 Subject: [PATCH] HBASE-1523 - NPE in BaseScanner git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@784670 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + src/java/org/apache/hadoop/hbase/master/BaseScanner.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index b1f7b80e2f2..a3ced48478b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -177,6 +177,7 @@ Release 0.20.0 - Unreleased earlied-out of previous row (Jon Gray) HBASE-1520 StoreFileScanner catches and ignore IOExceptions from HFile HBASE-1522 We delete splits before their time occasionally + HBASE-1523 NPE in BaseScanner IMPROVEMENTS HBASE-1089 Add count of regions on filesystem to master UI; add percentage diff --git a/src/java/org/apache/hadoop/hbase/master/BaseScanner.java b/src/java/org/apache/hadoop/hbase/master/BaseScanner.java index 3099860d590..28e15891ab6 100644 --- a/src/java/org/apache/hadoop/hbase/master/BaseScanner.java +++ b/src/java/org/apache/hadoop/hbase/master/BaseScanner.java @@ -298,7 +298,7 @@ abstract class BaseScanner extends Chore implements HConstants { throws IOException { boolean result = false; HRegionInfo split = - Writables.getHRegionInfo(rowContent.getValue(splitFamily, splitQualifier)); + Writables.getHRegionInfoOrNull(rowContent.getValue(splitFamily, splitQualifier)); if (split == null) { return result; }