From b62ac3cb11e005439e20dc8d7fb3c56cbab03c6b Mon Sep 17 00:00:00 2001
From: Guangxu Cheng <guangxucheng@gmail.com>
Date: Mon, 3 Sep 2018 11:12:53 +0800
Subject: [PATCH] HBASE-20892 [UI] Start / End keys are empty on table.jsp

---
 .../src/main/resources/hbase-webapps/master/table.jsp     | 8 ++++----
 1 file changed, 4 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 a8b54ed56c9..ea81cf60109 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -84,7 +84,7 @@
   final String escaped_fqtn = StringEscapeUtils.escapeHtml4(fqtn);
   String sortKey = request.getParameter("sort");
   String reverse = request.getParameter("reverse");
-  final boolean reverseOrder = (reverse==null||!reverse.equals("false"));
+  final boolean reverseOrder = (reverse != null && reverse.equals("true"));
   String showWholeKey = request.getParameter("showwhole");
   final boolean showWhole = (showWholeKey!=null && showWholeKey.equals("true"));
   Table table;
@@ -455,7 +455,7 @@ Sort As
 <option value="locality">Locality</option>
 </select>
 Ascending<input type="checkbox" id="ascending" value="Ascending" style="margin-right:10px">
-ShowDetailName&Start/End Key<input type="checkbox" id="showWhole" style="margin-right:10px">
+ShowDetailName<input type="checkbox" id="showWhole" style="margin-right:10px">
 <input type="button" id="submit" value="Reorder" onClick="reloadAsSort()" style="font-size: 12pt; width: 5em; margin-bottom: 5px" class="btn">
 <p>
 
@@ -634,8 +634,8 @@ ShowDetailName&Start/End Key<input type="checkbox" id="showWhole" style="margin-
   <td><%= fileCount%></td>
   <td><%= memSize%></td>
   <td><%= locality%></td>
-  <td><%= escapeXml(showWhole?Bytes.toStringBinary(regionInfo.getStartKey()):"-")%></td>
-  <td><%= escapeXml(showWhole?Bytes.toStringBinary(regionInfo.getEndKey()):"-")%></td>
+  <td><%= escapeXml(Bytes.toStringBinary(regionInfo.getStartKey()))%></td>
+  <td><%= escapeXml(Bytes.toStringBinary(regionInfo.getEndKey()))%></td>
   <td><%= state%></td>
   <%
   if (withReplica) {