Repository: hbase Updated Branches: refs/heads/master 979767824 -> 988ea870e
HBASE-18309 (addendum) fix NPE in LogCleaner Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/988ea870 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/988ea870 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/988ea870 Branch: refs/heads/master Commit: 988ea870ed1760976d1596a56a75216b2d9d2762 Parents: 9797678 Author: Chia-Ping Tsai <[email protected]> Authored: Sun Dec 17 17:05:12 2017 +0800 Committer: Chia-Ping Tsai <[email protected]> Committed: Sun Dec 17 17:33:09 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/988ea870/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java index 3cb620e..44aafe2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java @@ -163,7 +163,9 @@ public class LogCleaner extends CleanerChore<BaseLogCleanerDelegate> { LOG.warn("Failed to clean oldwals with exception: " + e); succeed = false; } finally { - context.setResult(succeed); + if (context != null) { + context.setResult(succeed); + } if (interrupted) { // Restore interrupt status Thread.currentThread().interrupt();
