Merge branch '5.1.x'

2019-07-07 14:49:34 +02:00
parent e57845a50f efab6eb55d
commit 8f5b2b2231
4 changed files with 22 additions and 3 deletions
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -596,7 +596,9 @@ public class MediaType extends MimeType implements Serializable {
 		List<String> tokenizedTypes = MimeTypeUtils.tokenize(mediaTypes);
 		List<MediaType> result = new ArrayList<>(tokenizedTypes.size());
 		for (String type : tokenizedTypes) {
-			result.add(parseMediaType(type));
+			if (StringUtils.hasText(type)) {
+				result.add(parseMediaType(type));
+			}
 		}
 		return result;
 	}