root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

SPR-8697 Flag '*/subtype' as illegal.

This commit is contained in:
Rossen Stoyanchev 2011-11-17 20:15:49 +00:00
parent e7377e3c27
commit 01cc76f8e3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.web/src/main/java/org/springframework/http/MediaType.java
View File

@ -575,6 +575,9 @@ public class MediaType implements Comparable<MediaType> {
} }
String type = fullType.substring(0, subIndex); String type = fullType.substring(0, subIndex);
String subtype = fullType.substring(subIndex + 1, fullType.length()); String subtype = fullType.substring(subIndex + 1, fullType.length());
if (WILDCARD_TYPE.equals(type) && !WILDCARD_TYPE.equals(subtype)) {
throw new IllegalArgumentException("A wildcard type is legal only in '*/*' (all media types).");
}
Map<String, String> parameters = null; Map<String, String> parameters = null;
if (parts.length > 1) { if (parts.length > 1) {

5
org.springframework.web/src/test/java/org/springframework/http/MediaTypeTests.java
View File

@ -128,6 +128,11 @@ public class MediaTypeTests {
MediaType.parseMediaType("audio/"); MediaType.parseMediaType("audio/");
} }
@Test(expected = IllegalArgumentException.class)
public void parseMediaTypeTypeRange() {
MediaType.parseMediaType("*/json");
}
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void parseMediaTypeIllegalType() { public void parseMediaTypeIllegalType() {
MediaType.parseMediaType("audio(/basic"); MediaType.parseMediaType("audio(/basic");