From b57bef5b7dd7f9907985563f5d1071f5ac0f6eab Mon Sep 17 00:00:00 2001
From: Mohammad Arshad <arshad@apache.org>
Date: Sun, 27 Sep 2020 11:35:38 +0530
Subject: [PATCH] HBASE-25077: hbck.jsp page loading fails, logs NPE in master
 log. (#2433)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
Signed-off-by: Viraj Jasani <vjasani@apache.org>
Signed-off-by: Pankaj Kumar<pankajkumar@apache.org>
---
 .../main/java/org/apache/hadoop/hbase/master/HbckChore.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java
index 8b886c8a459..0973d037c8a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java
@@ -255,10 +255,10 @@ public class HbckChore extends ScheduledChore {
     for (Map.Entry<String, HbckRegionInfo> entry : regionInfoMap.entrySet()) {
       HbckRegionInfo hri = entry.getValue();
       ServerName locationInMeta = hri.getMetaEntry().getRegionServer();
+      if (locationInMeta == null) {
+        continue;
+      }
       if (hri.getDeployedOn().size() == 0) {
-        if (locationInMeta == null) {
-          continue;
-        }
         // skip the offline region which belong to disabled table.
         if (disabledTableRegions.contains(hri.getRegionNameAsString())) {
           continue;