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 7773151de8ad..ced96b07ebaf 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -147,11 +147,32 @@
return "";
}
%>
+
+
+
+
+
<%
final String ZEROMB = "0 MB";
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
Configuration conf = master.getConfiguration();
String fqtn = request.getParameter("name");
+ // handle the case for fqtn is null or master is not initialized with error message + redirect
+ if (fqtn == null || !master.isInitialized()) {
+%>
+
+<% return;
+ } %>
+
+<%
final String escaped_fqtn = StringEscapeUtils.escapeHtml4(fqtn);
Table table = master.getConnection().getTable(TableName.valueOf(fqtn));
boolean showFragmentation = conf.getBoolean("hbase.master.ui.fragmentation.enabled", false);
@@ -200,24 +221,6 @@
final MetaBrowser metaBrowser = new MetaBrowser(connection, request);
%>
-
-
-
-
-<% // handle the case for fqtn is null or master is not initialized with error message + redirect
- if (fqtn == null || ! master.isInitialized()) { %>
-
-<% return;
- } %>
-
<% // unknow table
if (! admin.tableExists(TableName.valueOf(fqtn)).get()) { %>