From 1e9471908475ff271bd32521bb6f21b3445dbc9a Mon Sep 17 00:00:00 2001 From: reger Date: Fri, 29 Nov 2013 23:23:47 +0100 Subject: [PATCH] fix NPE on mime detection of unknown file extension --- source/net/yacy/http/YaCyDefaultServlet.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source/net/yacy/http/YaCyDefaultServlet.java b/source/net/yacy/http/YaCyDefaultServlet.java index 6d9022d8e..4a861f0ed 100644 --- a/source/net/yacy/http/YaCyDefaultServlet.java +++ b/source/net/yacy/http/YaCyDefaultServlet.java @@ -70,6 +70,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.eclipse.jetty.http.MimeTypes; +import org.eclipse.jetty.io.Buffer; import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.resource.Resource; @@ -309,8 +310,10 @@ public abstract class YaCyDefaultServlet extends HttpServlet { /* ------------------------------------------------------------ */ protected void writeHeaders(HttpServletResponse response, Resource resource, long count) { if (response.getContentType() == null) { - String mime = _mimeTypes.getMimeByExtension(resource.getName()).toString(); - response.setContentType(mime); + Buffer extensionmime; + if ((extensionmime = _mimeTypes.getMimeByExtension(resource.getName())) != null) { + response.setContentType(extensionmime.toString()); + } } long lml = resource.lastModified();