From b18681cb3bc0de27a3e539d12dc0ba513b57f98f Mon Sep 17 00:00:00 2001
From: Karthik Palanisamy <kpalanisamy@hortonworks.com>
Date: Mon, 28 Oct 2019 20:31:25 -0700
Subject: [PATCH] HBASE-23199 Error populating Table-Attribute fields (#741)

Signed-off-by: GuangxuCheng  <guangxucheng@gmail.com>
---
 .../src/main/resources/hbase-webapps/master/table.jsp      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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 ad3de25cc8a..c7701269f86 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -356,8 +356,7 @@ if (fqtn != null && master.isInitialized()) {
   </tr>
 <%
     }
-
-  if (quota.hasThrottle()) {
+  if (quota != null && quota.hasThrottle()) {
     List<ThrottleSettings> throttles = QuotaSettingsFactory.fromTableThrottles(table.getName(), quota.getThrottle());
     if (throttles.size() > 0) {
 %>
@@ -389,8 +388,8 @@ if (fqtn != null && master.isInitialized()) {
   </tr>
 <%
     }
-  }
-  }
+   }
+ }
 %>
 </table>
 <h2>Table Schema</h2>