From 5fe59f7ed541193d94253d5d755126311b90b455 Mon Sep 17 00:00:00 2001 From: lujie Date: Mon, 11 Mar 2019 15:37:45 +0800 Subject: [PATCH] fix HBASE-22023 on branch 2.2 --- .../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 63faff5..ddd0989 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -1961,8 +1961,10 @@ public class HRegionServer extends HasThread implements // Leases is not a Thread. Internally it runs a daemon thread. If it gets // an unhandled exception, it will just exit. - Threads.setDaemonThreadRunning(this.leases.getThread(), getName() + ".leaseChecker", - uncaughtExceptionHandler); + if (this.leases != null) { + Threads.setDaemonThreadRunning(this.leases.getThread(), getName() + ".leaseChecker", + uncaughtExceptionHandler); + } // Create the log splitting worker and start it // set a smaller retries to fast fail otherwise splitlogworker could be blocked for -- 1.8.3.1