From 4dee4a854fece6516ba5006251898082c8fc161a Mon Sep 17 00:00:00 2001
From: Abhishek Singh Chouhan <achouhan@apache.org>
Date: Thu, 26 Oct 2017 19:40:06 +0530
Subject: [PATCH] HBASE-19094 NPE in
 RSGroupStartupWorker.waitForGroupTableOnline during master startup

---
 .../apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
index e116f58dd5d..9520f5fbf8a 100644
--- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
+++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
@@ -691,7 +691,9 @@ class RSGroupInfoManagerImpl implements RSGroupInfoManager {
                     if(cell != null) {
                       sn = ServerName.parseVersionedServerName(CellUtil.cloneValue(cell));
                     }
-                    if (tsm.isTableState(TableName.NAMESPACE_TABLE_NAME,
+                    if (sn == null) {
+                      nsFound.set(false);
+                    } else if (tsm.isTableState(TableName.NAMESPACE_TABLE_NAME,
                         TableState.State.ENABLED)) {
                       try {
                         ClientProtos.ClientService.BlockingInterface rs = conn.getClient(sn);