Mercurial Hosting > luan

comparison 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
comparison
equal deleted inserted replaced
821:292f2e31ab41 822:0048a843297a
33 import org.eclipse.jetty.http.MimeTypes; 33 import org.eclipse.jetty.http.MimeTypes;
34 import org.eclipse.jetty.io.Buffer; 34 import org.eclipse.jetty.io.Buffer;
35 import org.eclipse.jetty.io.ByteArrayBuffer; 35 import org.eclipse.jetty.io.ByteArrayBuffer;
36 import org.eclipse.jetty.io.WriterOutputStream; 36 import org.eclipse.jetty.io.WriterOutputStream;
37 import org.eclipse.jetty.server.AbstractHttpConnection; 37 import org.eclipse.jetty.server.AbstractHttpConnection;
38 import org.eclipse.jetty.server.Dispatcher; 38 import javax.servlet.RequestDispatcher;
39 import org.eclipse.jetty.server.Request; 39 import org.eclipse.jetty.server.Request;
40 import org.eclipse.jetty.server.Response; 40 import org.eclipse.jetty.server.Response;
41 import org.eclipse.jetty.server.handler.ContextHandler.Context; 41 import org.eclipse.jetty.server.handler.ContextHandler.Context;
42 import org.eclipse.jetty.util.URIUtil; 42 import org.eclipse.jetty.util.URIUtil;
43 import org.slf4j.Logger; 43 import org.slf4j.Logger;
317 /* ------------------------------------------------------------ */ 317 /* ------------------------------------------------------------ */
318 protected Resource getResource(HttpServletRequest request) throws MalformedURLException 318 protected Resource getResource(HttpServletRequest request) throws MalformedURLException
319 { 319 {
320 String servletPath; 320 String servletPath;
321 String pathInfo; 321 String pathInfo;
322 Boolean included = request.getAttribute(Dispatcher.INCLUDE_REQUEST_URI) != null; 322 Boolean included = request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI) != null;
323 if (included != null && included.booleanValue()) 323 if (included != null && included.booleanValue())
324 { 324 {
325 servletPath = (String)request.getAttribute(Dispatcher.INCLUDE_SERVLET_PATH); 325 servletPath = (String)request.getAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH);
326 pathInfo = (String)request.getAttribute(Dispatcher.INCLUDE_PATH_INFO); 326 pathInfo = (String)request.getAttribute(RequestDispatcher.INCLUDE_PATH_INFO);
327 327
328 if (servletPath == null && pathInfo == null) 328 if (servletPath == null && pathInfo == null)
329 { 329 {
330 servletPath = request.getServletPath(); 330 servletPath = request.getServletPath();
331 pathInfo = request.getPathInfo(); 331 pathInfo = request.getPathInfo();