Catch IAE when parsing content type

rstoyanchev · rstoyanchev · commit c61108341584 · 2013-03-01T16:30:02.000-05:00
Issue: SPR-10308
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
@@ -205,7 +205,12 @@ else if (patternAndMethodMatches.isEmpty() && !allowedMethods.isEmpty()) {
 		if (!consumableMediaTypes.isEmpty()) {
 			MediaType contentType = null;
 			if (StringUtils.hasLength(request.getContentType())) {
-				contentType = MediaType.parseMediaType(request.getContentType());
+				try {
+					contentType = MediaType.parseMediaType(request.getContentType());
+				}
+				catch (IllegalArgumentException ex) {
+					throw new HttpMediaTypeNotSupportedException(ex.getMessage());
+				}
 			}
 			throw new HttpMediaTypeNotSupportedException(contentType, new ArrayList<MediaType>(consumableMediaTypes));
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
@@ -180,6 +180,19 @@ private void testMediaTypeNotSupported(String url) throws Exception {
 		}
 	}
 
+	@Test
+	public void testMediaTypeNotValue() throws Exception {
+		try {
+			MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/person/1");
+			request.setContentType("bogus");
+			this.handlerMapping.getHandler(request);
+			fail("HttpMediaTypeNotSupportedException expected");
+		}
+		catch (HttpMediaTypeNotSupportedException ex) {
+			assertEquals("Invalid media type \"bogus\": does not contain '/'", ex.getMessage());
+		}
+	}
+
 	@Test
 	public void mediaTypeNotAccepted() throws Exception {
 		testMediaTypeNotAccepted("/persons");

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,12 @@ else if (patternAndMethodMatches.isEmpty() && !allowedMethods.isEmpty()) {`
`205`	`205`	`if (!consumableMediaTypes.isEmpty()) {`
`206`	`206`	`MediaType contentType = null;`
`207`	`207`	`if (StringUtils.hasLength(request.getContentType())) {`
`208`		`- contentType = MediaType.parseMediaType(request.getContentType());`
	`208`	`+ try {`
	`209`	`+ contentType = MediaType.parseMediaType(request.getContentType());`
	`210`	`+ }`
	`211`	`+ catch (IllegalArgumentException ex) {`
	`212`	`+ throw new HttpMediaTypeNotSupportedException(ex.getMessage());`
	`213`	`+ }`
`209`	`214`	`}`
`210`	`215`	`throw new HttpMediaTypeNotSupportedException(contentType, new ArrayList<MediaType>(consumableMediaTypes));`
`211`	`216`	`}`