Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Brian Clozel
2016-03-23 11:17:27 +01:00
parent c7bd3b8440
commit e079a726f8
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
View File

@@ -485,7 +485,10 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
if (mediaType == null) {
ServletWebRequest webRequest = new ServletWebRequest(request);
try {
getContentNegotiationManager().resolveMediaTypes(webRequest);
List<MediaType> mediaTypes = getContentNegotiationManager().resolveMediaTypes(webRequest);
if(!mediaTypes.isEmpty()) {
mediaType = mediaTypes.get(0);
}
}
catch (HttpMediaTypeNotAcceptableException ex) {
// Ignore