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

358027 NullPointerException in ResourceHandler with jetty-stylesheet.css

This commit is contained in:
Jan Bartel 2011-09-19 17:57:48 +10:00
parent 8e765f12c6
commit c984d25871
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
View File

@ -45,7 +45,7 @@ import org.eclipse.jetty.util.resource.Resource;
* *
* This handle will serve static content and handle If-Modified-Since headers. * This handle will serve static content and handle If-Modified-Since headers.
* No caching is done. * No caching is done.
* Requests that cannot be handled are let pass (Eg no 404's) * Requests for resources that do not exist are let pass (Eg no 404's).
* *
* *
* @org.apache.xbean.XBean * @org.apache.xbean.XBean
@ -205,7 +205,7 @@ public class ResourceHandler extends AbstractHandler
{ {
try try
{ {
_defaultStylesheet = Resource.newResource(this.getClass().getResource("/jetty-default.css")); _defaultStylesheet = Resource.newResource(this.getClass().getResource("/jetty-dir.css"));
} }
catch(IOException e) catch(IOException e)
{ {
@ -326,7 +326,7 @@ public class ResourceHandler extends AbstractHandler
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/* /*
* @see org.eclipse.jetty.server.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) * @see org.eclipse.jetty.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int)
*/ */
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{ {
@ -344,7 +344,7 @@ public class ResourceHandler extends AbstractHandler
Resource resource = getResource(request); Resource resource = getResource(request);
if (resource==null || !resource.exists()) if (resource==null || !resource.exists())
{ {
if (target.endsWith("/jetty-stylesheet.css")) if (target.endsWith("/jetty-dir.css"))
{ {
response.setContentType("text/css"); response.setContentType("text/css");
resource = getStylesheet(); resource = getStylesheet();
@ -359,7 +359,7 @@ public class ResourceHandler extends AbstractHandler
return; return;
} }
// We are going to server something // We are going to serve something
baseRequest.setHandled(true); baseRequest.setHandled(true);
if (resource.isDirectory()) if (resource.isDirectory())