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

less verbose #723

This commit is contained in:
Greg Wilkins 2016-07-20 14:19:13 +10:00
parent b58cd5870b
commit d6c73118be
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
View File

@ -211,27 +211,22 @@ public class MimeTypes
} }
else else
{ {
int count = 0;
try (InputStream in = mimeTypesUrl.openStream(); try (InputStream in = mimeTypesUrl.openStream();
InputStreamReader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) InputStreamReader reader = new InputStreamReader(in, StandardCharsets.UTF_8))
{ {
Properties mime = new Properties(); Properties mime = new Properties();
mime.load(reader); mime.load(reader);
mime.stringPropertyNames().stream()
.filter(x->x!=null)
.forEach(x->
__dftMimeMap.put(StringUtil.asciiToLowerCase(x), normalizeMimeType(mime.getProperty(x))));
for (String ext : mime.stringPropertyNames()) if (__dftMimeMap.size()<mime.size())
{ {
if (ext == null) LOG.warn("Encountered duplicate or null mime-type extension in resource: {}", mimeTypesUrl);
{
LOG.warn("Encountered null mime-type extension in resource: {}", mimeTypesUrl);
}
String m = mime.getProperty(ext);
__dftMimeMap.put(StringUtil.asciiToLowerCase(ext), normalizeMimeType(m));
count++;
} }
} }
if (__dftMimeMap.size()==0)
if (count < 1)
{ {
LOG.warn("Empty mime types declaration at {}", mimeTypesUrl); LOG.warn("Empty mime types declaration at {}", mimeTypesUrl);
} }
@ -253,26 +248,23 @@ public class MimeTypes
} }
else else
{ {
int count = 0;
try (InputStream in = mimeTypesUrl.openStream(); try (InputStream in = mimeTypesUrl.openStream();
InputStreamReader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) InputStreamReader reader = new InputStreamReader(in, StandardCharsets.UTF_8))
{ {
Properties encoding = new Properties(); Properties encoding = new Properties();
encoding.load(reader); encoding.load(reader);
for (String type : encoding.stringPropertyNames()) encoding.stringPropertyNames().stream()
.filter(t->t!=null)
.forEach(t->__encodings.put(t, encoding.getProperty(t)));
if (__encodings.size()<encoding.size())
{ {
if (type == null) LOG.warn("Encountered null or duplicate encoding type in resource: {}", mimeTypesUrl);
{
LOG.warn("Encountered null encoding type in resource: {}", mimeTypesUrl);
}
__encodings.put(type, encoding.getProperty(type));
count++;
} }
} }
if (count < 1) if (__encodings.size()==0)
{ {
LOG.warn("Empty mime types declaration at {}", mimeTypesUrl); LOG.warn("Empty mime types declaration at {}", mimeTypesUrl);
} }