Mercurial Hosting > luan

diff src/org/eclipse/jetty/server/handler/ResourceHandler.java @ 822:0048a843297a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove Dispatcher
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 14 Sep 2016 00:58:52 -0600
parents 8e9db0bbf4f9
children f89abbfb3a8f
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/handler/ResourceHandler.java	Wed Sep 14 00:48:03 2016 -0600
+++ b/src/org/eclipse/jetty/server/handler/ResourceHandler.java	Wed Sep 14 00:58:52 2016 -0600
@@ -35,7 +35,7 @@
 import org.eclipse.jetty.io.ByteArrayBuffer;
 import org.eclipse.jetty.io.WriterOutputStream;
 import org.eclipse.jetty.server.AbstractHttpConnection;
-import org.eclipse.jetty.server.Dispatcher;
+import javax.servlet.RequestDispatcher;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.handler.ContextHandler.Context;
@@ -319,11 +319,11 @@
 	{
 		String servletPath;
 		String pathInfo;
-		Boolean included = request.getAttribute(Dispatcher.INCLUDE_REQUEST_URI) != null;
+		Boolean included = request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI) != null;
 		if (included != null && included.booleanValue())
 		{
-			servletPath = (String)request.getAttribute(Dispatcher.INCLUDE_SERVLET_PATH);
-			pathInfo = (String)request.getAttribute(Dispatcher.INCLUDE_PATH_INFO);
+			servletPath = (String)request.getAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH);
+			pathInfo = (String)request.getAttribute(RequestDispatcher.INCLUDE_PATH_INFO);
  
 			if (servletPath == null && pathInfo == null)
 			{