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

Merge branch 'jetty-9.4.x-5214-head-huge-static' of https://github.com/eclipse/jetty.project into jetty-9.4.x-5214-head-huge-static

This commit is contained in:
Greg Wilkins 2020-08-31 18:22:10 +02:00
parent 9e326fe520 9128fc48e4
commit a6b7f73019
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -578,7 +578,7 @@ public class ResourceService
{ {
//Get jetty's Response impl //Get jetty's Response impl
String mdlm = content.getLastModifiedValue(); String mdlm = content.getLastModifiedValue();
if (mdlm != null && ifms.equals(mdlm)) if (ifms.equals(mdlm))
{ {
sendStatus(response, HttpServletResponse.SC_NOT_MODIFIED, content::getETagValue); sendStatus(response, HttpServletResponse.SC_NOT_MODIFIED, content::getETagValue);
return false; return false;
@ -764,7 +764,7 @@ public class ResourceService
// content-length header // content-length header
// //
putHeaders(response, content, Response.NO_CONTENT_LENGTH); putHeaders(response, content, Response.NO_CONTENT_LENGTH);
String mimetype = (content == null ? null : content.getContentTypeValue()); String mimetype = content.getContentTypeValue();
if (mimetype == null) if (mimetype == null)
LOG.warn("Unknown mimetype for " + request.getRequestURI()); LOG.warn("Unknown mimetype for " + request.getRequestURI());
MultiPartOutputStream multi = new MultiPartOutputStream(out); MultiPartOutputStream multi = new MultiPartOutputStream(out);