You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ch...@apache.org on 2017/12/17 09:36:25 UTC
hbase git commit: HBASE-18309 (addendum) fix NPE in LogCleaner
Repository: hbase
Updated Branches:
refs/heads/branch-2 8fa08b56f -> 1ca2d1029
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/1ca2d102
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1ca2d102
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1ca2d102
Branch: refs/heads/branch-2
Commit: 1ca2d10299111e60af905e141ddf3146dc1e1cbc
Parents: 8fa08b5
Author: Chia-Ping Tsai <ch...@gmail.com>
Authored: Sun Dec 17 17:05:12 2017 +0800
Committer: Chia-Ping Tsai <ch...@gmail.com>
Committed: Sun Dec 17 17:30:33 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/1ca2d102/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();