SPR-7869 - Accept-Charset header with '*' results in java.nio.charset.IllegalCharsetNameException

2011-01-10 11:24:48 +00:00
parent 2fcab44de0
commit 4998d061f8
2 changed files with 18 additions and 5 deletions
--- a/org.springframework.web/src/main/java/org/springframework/http/HttpHeaders.java
+++ b/org.springframework.web/src/main/java/org/springframework/http/HttpHeaders.java
@@ -177,11 +177,15 @@ public class HttpHeaders implements MultiValueMap<String, String> {
 			String[] tokens = value.split(",\\s*");
 			for (String token : tokens) {
 				int paramIdx = token.indexOf(';');
+				String charsetName;
 				if (paramIdx == -1) {
-					result.add(Charset.forName(token));
+					charsetName = token;
 				}
 				else {
-					result.add(Charset.forName(token.substring(0, paramIdx)));
+					charsetName = token.substring(0, paramIdx);
+				}
+				if (!charsetName.equals("*")) {
+					result.add(Charset.forName(charsetName));
 				}
 			}
 		}