Repository: hbase Updated Branches: refs/heads/branch-2 1a5aedab3 -> dee13ea40 refs/heads/branch-2.0 99d62d07d -> 4bf313439
HBASE-20892 [UI] Start / End keys are empty on table.jsp Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dee13ea4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dee13ea4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dee13ea4 Branch: refs/heads/branch-2 Commit: dee13ea401a51f2e2b136b8b1ab18cb6814d9b32 Parents: 1a5aeda Author: Guangxu Cheng <guangxuch...@gmail.com> Authored: Wed Sep 5 09:21:38 2018 +0800 Committer: Guangxu Cheng <guangxuch...@gmail.com> Committed: Wed Sep 5 09:21:38 2018 +0800 ---------------------------------------------------------------------- .../src/main/resources/hbase-webapps/master/table.jsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/dee13ea4/hbase-server/src/main/resources/hbase-webapps/master/table.jsp ---------------------------------------------------------------------- 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 d7844df..c9b16c6 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -80,7 +80,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; @@ -443,7 +443,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> @@ -622,8 +622,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> <% if (withReplica) { %>