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

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

commit bef0616ef33306afca3060b96c2cba5f9762035d
Author: Wellington Chevreuil <[email protected]>
AuthorDate: Thu Jan 16 14:01:45 2020 +0000

    Revert "fix 500/NPE of region.jsp (#1033)"
    
    This reverts commit 28f07451a5dddf0ab3988b32b8672654fdbc5b58.
    (reverting because commit message lacks the jira id. We re-apply soon)
---
 .../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