From 9e7b16b88ed6e9c2c3f53743bfe5c74098f2b8a4 Mon Sep 17 00:00:00 2001
From: Pankaj Kumar <pankaj.kr@huawei.com>
Date: Tue, 26 Sep 2017 20:01:06 +0800
Subject: [PATCH] HBASE-18874, HMaster abort message will be skipped if
 Throwable is passed null

Signed-off-by: tedyu <yuzhihong@gmail.com>
---
 .../main/java/org/apache/hadoop/hbase/master/HMaster.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index cfb43008d37..e675d7e2db5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2634,7 +2634,12 @@ public class HMaster extends HRegionServer implements MasterServices {
       LOG.fatal("Master server abort: loaded coprocessors are: " +
           getLoadedCoprocessors());
     }
-    if (t != null) LOG.fatal(msg, t);
+    if (t != null) {
+      LOG.fatal(msg, t);
+    } else {
+      LOG.fatal(msg);
+    }
+
     try {
       stopMaster();
     } catch (IOException e) {