465700 NullPointerException in ResourceHandler with welcome files

jetty · Apr 29, 2015 · 25474ff · 25474ff
1 parent d7de34a
commit 25474ff
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
@@ -447,7 +447,9 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
         // handle directories
         if (resource.isDirectory())
         {
-            if (!request.getPathInfo().endsWith(URIUtil.SLASH))
+            String pathInfo = request.getPathInfo();
+            boolean endsWithSlash=(pathInfo==null?request.getServletPath():pathInfo).endsWith(URIUtil.SLASH);
+            if (!endsWithSlash)
             {
                 response.sendRedirect(response.encodeRedirectURL(URIUtil.addPaths(request.getRequestURI(),URIUtil.SLASH)));
                 return;