[hbase] branch branch-2.2 updated: HBASE-25077: hbck.jsp page loading fails, logs NPE in master log. (#2433)

[zg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zghao pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.2 by this push:
     new 3a1f1cd  HBASE-25077: hbck.jsp page loading fails, logs NPE in master log. (#2433)
3a1f1cd is described below

commit 3a1f1cd58d887dba98037a40d2c7e2e05f9cc28e
Author: Mohammad Arshad <ar...@apache.org>
AuthorDate: Sun Sep 27 11:35:38 2020 +0530

    HBASE-25077: hbck.jsp page loading fails, logs NPE in master log. (#2433)
    
    Signed-off-by: Duo Zhang <zh...@apache.org>
    Signed-off-by: Viraj Jasani <vj...@apache.org>
    Signed-off-by: Pankaj Kumar<pa...@apache.org>
---
 .../src/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 5f04c84..63fb5dd 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;