diff src/org/eclipse/jetty/server/handler/ResourceHandler.java @ 991:688c39c50ee3

simplify ContextHandler
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 18 Oct 2016 00:22:46 -0600
parents f89abbfb3a8f
children 0608a6664bee
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/handler/ResourceHandler.java	Mon Oct 17 05:50:47 2016 -0600
+++ b/src/org/eclipse/jetty/server/handler/ResourceHandler.java	Tue Oct 18 00:22:46 2016 -0600
@@ -38,7 +38,6 @@
 import javax.servlet.RequestDispatcher;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
-import org.eclipse.jetty.server.handler.ContextHandler.Context;
 import org.eclipse.jetty.util.URIUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -133,11 +132,7 @@
 	public void doStart()
 	throws Exception
 	{
-		Context scontext = ContextHandler.getCurrentContext();
-		_context = (scontext==null?null:scontext.getContextHandler());
-
-		if (_context!=null)
-			_aliases=_context.isAliases();
+		_context = ContextHandler.getCurrentContext();
 
 		if (!_aliases && !FileResource.getCheckAliases())
 			throw new IllegalStateException("Alias checking disabled");