HBASE-18309 (addendum) fix NPE in LogCleaner

2017-12-17 17:05:12 +08:00 · 2017-12-17 17:05:12 +08:00 · 1ca2d10299
parent 8fa08b56f3
commit 1ca2d10299
1 changed files with 3 additions and 1 deletions
--- 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 {
+        if (context != null) {
          context.setResult(succeed);
+        }
        if (interrupted) {
          // Restore interrupt status
          Thread.currentThread().interrupt();