This is an automated email from the ASF dual-hosted git repository.

wchevreuil pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit bd4eba2b53b7af738fd9584511d737c4393d0855
Author: Wellington Chevreuil <[email protected]>
AuthorDate: Thu Jan 16 13:59:05 2020 +0000

    Revert "fix 500/NPE of region.jsp (#1033)"
    
    This reverts commit ae95b1f215a120890de5454739651911749057ca.
    (reverting as commit message lacks jira id. Will rea-apply soon with the 
jira id)
---
 .../src/main/resources/hbase-webapps/regionserver/region.jsp     | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git 
a/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp 
b/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp
index 382783e..8183c69 100644
--- a/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp
@@ -32,13 +32,8 @@
   HRegionServer rs = (HRegionServer) 
getServletContext().getAttribute(HRegionServer.REGIONSERVER);
 
   Region region = rs.getRegion(regionName);
-  String displayName;
-  if (region != null) {
-    displayName = 
RegionInfoDisplay.getRegionNameAsStringForDisplay(region.getRegionInfo(),
-            rs.getConfiguration());
-  } else {
-    displayName = "region {" + regionName + "} is not currently online on this 
region server";
-  }
+  String displayName = 
RegionInfoDisplay.getRegionNameAsStringForDisplay(region.getRegionInfo(),
+    rs.getConfiguration());
   pageContext.setAttribute("pageTitle", "HBase RegionServer: " + 
rs.getServerName());
 %>
 <jsp:include page="header.jsp">

Reply via email to