From acf68b6cf99c384eb5bbe082439e635883202370 Mon Sep 17 00:00:00 2001 From: Samir Ahmic Date: Wed, 14 Mar 2018 09:58:58 +0100 Subject: [PATCH] HBASE-20192 RedirectServlet not getting registered in HMaster.putUpJettyServer() in local mode --- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index b928e52..e406b6f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -189,8 +189,8 @@ import org.apache.yetus.audience.InterfaceAudience; import org.apache.zookeeper.KeeperException; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.webapp.WebAppContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -618,9 +618,10 @@ public class HMaster extends HRegionServer implements MasterServices { StringUtils.isBlank(useThisHostnameInstead) ? null : useThisHostnameInstead; final RedirectServlet redirect = new RedirectServlet(infoServer, redirectHostname); - final WebAppContext context = new WebAppContext(null, "/", null, null, null, null, WebAppContext.NO_SESSIONS); + ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); + context.setContextPath("/"); context.addServlet(new ServletHolder(redirect), "/*"); - context.setServer(masterJettyServer); + masterJettyServer.setHandler(context); try { masterJettyServer.start(); -- 2.7.4 (Apple Git-66)