From c5af92b644de1afa4b2659f5e3b96cdbc5688ea9 Mon Sep 17 00:00:00 2001
From: Guanghao <zghao@apache.org>
Date: Thu, 18 Jul 2019 08:20:36 +0800
Subject: [PATCH] HBASE-22704 Avoid NPE when access table.jsp and snapshot.jsp
 but master not finish initialization (#389)

---
 .../main/resources/hbase-webapps/master/snapshot.jsp  | 11 +++++++++--
 .../src/main/resources/hbase-webapps/master/table.jsp |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp
index 6e1c9eb4cfb..1ea2b40a4e5 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp
@@ -36,7 +36,7 @@
   SnapshotInfo.SnapshotStats stats = null;
   TableName snapshotTable = null;
   boolean tableExists = false;
-  if(snapshotName != null) {
+  if(snapshotName != null && master.isInitialized()) {
     try (Admin admin = master.getConnection().getAdmin()) {
       for (SnapshotDescription snapshotDesc: admin.listSnapshots()) {
         if (snapshotName.equals(snapshotDesc.getName())) {
@@ -66,7 +66,14 @@
 </jsp:include>
 
 <div class="container-fluid content">
-<% if (snapshot == null) { %>
+<% if (!master.isInitialized()) { %>
+    <div class="row inner_header">
+    <div class="page-header">
+    <h1>Master is not initialized</h1>
+    </div>
+    </div>
+    <jsp:include page="redirect.jsp" />
+<% } else if (snapshot == null) { %>
   <div class="row inner_header">
     <div class="page-header">
       <h1>Snapshot "<%= snapshotName %>" does not exist</h1>
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
index 8bf98730e59..d6c59ae83dd 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -126,7 +126,7 @@
 </jsp:include>
 
 <%
-if ( fqtn != null ) {
+if (fqtn != null && master.isInitialized()) {
   try {
   table = master.getConnection().getTable(TableName.valueOf(fqtn));
   if (table.getTableDescriptor().getRegionReplication() > 1) {
@@ -684,7 +684,7 @@ Actions:
   </div> <%
   }
 }
-  else { // handle the case for fqtn is null with error message + redirect
+  else { // handle the case for fqtn is null or master is not initialized with error message + redirect
 %>
 <div class="container-fluid content">
     <div class="row inner_header">