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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2014-07-01 15:11:36 +02:00
parent 4384c1ae50
commit 86ea3059b6
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-web/src/main/java/org/springframework/http/HttpHeaders.java
View File

@@ -155,12 +155,15 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
*/
public List<MediaType> getAccept() {
String value = getFirst(ACCEPT);
List<MediaType> result = (value != null) ? MediaType.parseMediaTypes(value) : Collections.<MediaType>emptyList();
List<MediaType> result = (value != null ? MediaType.parseMediaTypes(value) : Collections.<MediaType>emptyList());
// Some containers parse 'Accept' into multiple values
if ((result.size() == 1) && (get(ACCEPT).size() > 1)) {
value = StringUtils.collectionToCommaDelimitedString(get(ACCEPT));
result = MediaType.parseMediaTypes(value);
if (result.size() == 1) {
List<String> acceptHeader = get(ACCEPT);
if (acceptHeader.size() > 1) {
value = StringUtils.collectionToCommaDelimitedString(acceptHeader);
result = MediaType.parseMediaTypes(value);
}
}
return result;