Fix NPE in AbstractMessageConverterMethodProcessor

Issue: SPR-9868
12 years ago · d4fa5c0331
parent c020096bbd
commit d4fa5c0331
1 changed files with 1 additions and 2 deletions
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
@ -141,9 +141,8 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
 			}
 		}

-		selectedMediaType = selectedMediaType.removeQualityValue();
-
 		if (selectedMediaType != null) {
+			selectedMediaType = selectedMediaType.removeQualityValue();
 			for (HttpMessageConverter<?> messageConverter : messageConverters) {
 				if (messageConverter.canWrite(returnValueClass, selectedMediaType)) {
 					((HttpMessageConverter<T>) messageConverter).write(returnValue, selectedMediaType, outputMessage);