Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640

This commit is contained in:
Jan Bartel 2017-10-03 14:25:38 +11:00
parent b451ee7a63 1a7ff6854d
commit 7a1d076e64
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java
View File

@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.AsyncContext; import javax.servlet.AsyncContext;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -402,7 +403,9 @@ public class ResourceService
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("welcome={}",welcome); LOG.debug("welcome={}",welcome);
if (_redirectWelcome) ServletContext context = request.getServletContext();
if (_redirectWelcome || context==null)
{ {
// Redirect to the index // Redirect to the index
response.setContentLength(0); response.setContentLength(0);
@ -416,7 +419,7 @@ public class ResourceService
return; return;
} }
RequestDispatcher dispatcher=request.getServletContext().getRequestDispatcher(welcome); RequestDispatcher dispatcher=context.getRequestDispatcher(welcome);
if (dispatcher!=null) if (dispatcher!=null)
{ {
// Forward to the index // Forward to the index