Avoid use of Optional wrapper to get List<MediaType>

See gh-26170
This commit is contained in:
Rossen Stoyanchev
2020-11-30 17:30:45 +00:00
parent e7b0b65244
commit 0c825621b8
2 changed files with 11 additions and 6 deletions

View File

@@ -736,7 +736,10 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
mediaType = this.mediaTypes.get(ext.toLowerCase(Locale.ENGLISH));
}
if (mediaType == null) {
mediaType = MediaTypeFactory.getMediaType(filename).orElse(null);
List<MediaType> mediaTypes = MediaTypeFactory.getMediaTypes(filename);
if (!CollectionUtils.isEmpty(mediaTypes)) {
mediaType = mediaTypes.get(0);
}
}
if (mediaType != null) {
result = mediaType;