Repository: hbase Updated Branches: refs/heads/master cfd4b7d56 -> 1413522f6
HBASE-20577 Addendum Fall back to old design if FNF Signed-off-by: tedyu <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1413522f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1413522f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1413522f Branch: refs/heads/master Commit: 1413522f6f99e2dbbca9a67b6ece78beb2841bc4 Parents: cfd4b7d Author: Nihal Jain <[email protected]> Authored: Mon Jun 4 23:31:07 2018 +0530 Committer: tedyu <[email protected]> Committed: Wed Jun 6 13:52:59 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/http/log/LogLevel.java | 23 +++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1413522f/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java ---------------------------------------------------------------------- diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java index aa223f3..cb23421 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.http.log; import java.io.BufferedReader; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; import java.io.PrintWriter; @@ -106,9 +107,15 @@ public final class LogLevel { return; } response.setContentType("text/html"); - String requestedURL = "header.jsp?pageTitle=Log Level"; - request.getRequestDispatcher(requestedURL).include(request, response); - PrintWriter out = response.getWriter(); + PrintWriter out; + try { + String headerPath = "header.jsp?pageTitle=Log Level"; + request.getRequestDispatcher(headerPath).include(request, response); + out = response.getWriter(); + } catch (FileNotFoundException e) { + // in case file is not found fall back to old design + out = ServletUtil.initHTML(response, "Log Level"); + } out.println(FORMS); String logName = ServletUtil.getParameter(request, "log"); @@ -136,8 +143,14 @@ public final class LogLevel { out.println("Sorry, " + log.getClass() + " not supported.<br />"); } } - out.println("</div>"); - request.getRequestDispatcher("footer.jsp").include(request, response); + + try { + String footerPath = "footer.jsp"; + out.println("</div>"); + request.getRequestDispatcher(footerPath).include(request, response); + } catch (FileNotFoundException e) { + out.println(ServletUtil.HTML_TAIL); + } out.close(); }
