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 51e293383c6c312e1e764572d8df7eaac64da41a Author: WenFeiYi <[email protected]> AuthorDate: Wed Jan 15 19:32:27 2020 +0800 HBASE-23677 fix 500/NPE of region.jsp (#1033) Signed-off-by: Wellington Chevreuil <[email protected]> (cherry picked from commit d60ce17c1765a445e944738f49953579bdf0bba6) --- .../src/main/resources/hbase-webapps/regionserver/region.jsp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 8183c69..382783e 100644 --- a/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp @@ -32,8 +32,13 @@ HRegionServer rs = (HRegionServer) getServletContext().getAttribute(HRegionServer.REGIONSERVER); Region region = rs.getRegion(regionName); - String displayName = RegionInfoDisplay.getRegionNameAsStringForDisplay(region.getRegionInfo(), - rs.getConfiguration()); + String displayName; + if (region != null) { + displayName = RegionInfoDisplay.getRegionNameAsStringForDisplay(region.getRegionInfo(), + rs.getConfiguration()); + } else { + displayName = "region {" + regionName + "} is not currently online on this region server"; + } pageContext.setAttribute("pageTitle", "HBase RegionServer: " + rs.getServerName()); %> <jsp:include page="header.jsp">
