[hbase] branch branch-2 updated: HBASE-23199 Error populating Table-Attribute fields (#741)

[gx...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-2 by this push:
     new b18681c  HBASE-23199 Error populating Table-Attribute fields (#741)
b18681c is described below

commit b18681cb3bc0de27a3e539d12dc0ba513b57f98f
Author: Karthik Palanisamy <kp...@hortonworks.com>
AuthorDate: Mon Oct 28 20:31:25 2019 -0700

    HBASE-23199 Error populating Table-Attribute fields (#741)
    
    Signed-off-by: GuangxuCheng  <gu...@gmail.com>
---
 hbase-server/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 ad3de25..c770126 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>