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

SPR-8917 Fix issue with quoted parameter values in MediaType.

Browse Source
This commit is contained in:
Rossen Stoyanchev
2012-01-13 15:25:53 -05:00
parent b0c735feae
commit e8fc90ce3e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,7 +331,7 @@ public class MediaType implements Comparable<MediaType> {
String attribute = entry.getKey();
String value = entry.getValue();
checkParameters(attribute, value);
m.put(attribute, unquote(value));
m.put(attribute, value);
}
this.parameters = Collections.unmodifiableMap(m);
}
@@ -428,7 +428,7 @@ public class MediaType implements Comparable<MediaType> {
*/
public Charset getCharSet() {
String charSet = getParameter(PARAM_CHARSET);
return (charSet != null ? Charset.forName(charSet) : null);
return (charSet != null ? Charset.forName(unquote(charSet)) : null);
}
/**
@@ -438,7 +438,7 @@ public class MediaType implements Comparable<MediaType> {
*/
public double getQualityValue() {
String qualityFactory = getParameter(PARAM_QUALITY_FACTOR);
return (qualityFactory != null ? Double.parseDouble(qualityFactory) : 1D);
return (qualityFactory != null ? Double.parseDouble(unquote(qualityFactory)) : 1D);
}
/**

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

@@ -173,9 +173,12 @@ public class MediaTypeTests {
MediaType.parseMediaType("text/html; charset=foo-bar");
}
// SPR-8917
@Test
public void parseMediaTypeQuotedParameterValue() {
MediaType.parseMediaType("audio/*;attr=\"v>alue\"");
MediaType mediaType = MediaType.parseMediaType("audio/*;attr=\"v>alue\"");
assertEquals("\"v>alue\"", mediaType.getParameter("attr"));
}
@Test(expected = IllegalArgumentException.class)