You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2019/10/31 17:38:20 UTC
[hbase] 01/02: Revert "Revert "HBASE-23199 Error populating
Table-Attribute fields (#741)"" Reapply. Mistakenly reverted.
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit cfd3da1186a8f88cbac43c72229f4961a4625bc3
Author: stack <st...@apache.org>
AuthorDate: Thu Oct 31 10:37:43 2019 -0700
Revert "Revert "HBASE-23199 Error populating Table-Attribute fields (#741)""
Reapply. Mistakenly reverted.
This reverts commit 6a8173561be136ce87a87ae6a765d39726345901.
---
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 568a6e6..5f808c8 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>