From 96aca6b15392e9bdc611eee7e3273f424730cbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B8=96=E5=BD=AC10204932?= Date: Fri, 23 Jun 2017 17:17:03 +0800 Subject: [PATCH] HBASE-18263 Resolve NPE in backup Master UI when accessing procedures.jsp Signed-off-by: tedyu --- .../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 2 ++ .../src/main/resources/hbase-webapps/master/tablesDetailed.jsp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 14dfe0a02cf..58ae3eb07c0 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -125,7 +125,9 @@ AssignmentManager assignmentManager = master.getAssignmentManager();