Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-21 00:00:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix NPE on mime detection of unknown file extension

Browse Source
This commit is contained in:
reger 2013-11-29 23:23:47 +01:00
parent effea4bca0
commit 1e94719084
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/net/yacy/http/YaCyDefaultServlet.java
View File

@ -70,6 +70,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.eclipse.jetty.http.MimeTypes; import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.io.Buffer;
import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.URIUtil;
import org.eclipse.jetty.util.resource.Resource; 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) { protected void writeHeaders(HttpServletResponse response, Resource resource, long count) {
if (response.getContentType() == null) { if (response.getContentType() == null) {
String mime = _mimeTypes.getMimeByExtension(resource.getName()).toString(); Buffer extensionmime;
response.setContentType(mime); if ((extensionmime = _mimeTypes.getMimeByExtension(resource.getName())) != null) {
response.setContentType(extensionmime.toString());
}
} }
long lml = resource.lastModified(); long lml = resource.lastModified();