Repository: hbase Updated Branches: refs/heads/0.98 1391cd919 -> da8d1502c
HBASE-11845 addendum Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/da8d1502 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/da8d1502 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/da8d1502 Branch: refs/heads/0.98 Commit: da8d1502cf58de9d5196f1d8da3cee84fe89b404 Parents: 1391cd9 Author: Nick Dimiduk <[email protected]> Authored: Thu Sep 11 15:45:44 2014 -0700 Committer: Nick Dimiduk <[email protected]> Committed: Thu Sep 11 15:53:33 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java | 3 +++ .../apache/hadoop/hbase/regionserver/TestScanWithBloomError.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/da8d1502/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java index 37a5b06..4252ba6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java @@ -190,6 +190,9 @@ public class HFilePrettyPrinter extends Configured implements Tool { * exit code (zero for success, non-zero for failure). */ public int run(String[] args) { + if (getConf() == null) { + throw new RuntimeException("A Configuration instance must be provided."); + } try { FSUtils.setFsDefault(getConf(), FSUtils.getRootDir(getConf())); if (!parseOptions(args)) http://git-wip-us.apache.org/repos/asf/hbase/blob/da8d1502/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java index 011de0f..4fd7199 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java @@ -149,7 +149,7 @@ public class TestScanWithBloomError { for (StoreFileScanner sfScanner : scanners) lastStoreFileReader = sfScanner.getReaderForTesting(); - new HFilePrettyPrinter().run(new String[]{ "-m", "-p", "-f", + new HFilePrettyPrinter(conf).run(new String[]{ "-m", "-p", "-f", lastStoreFileReader.getHFileReader().getPath().toString()}); // Disable Bloom filter for the last store file. The disabled Bloom filter
