From 0047200b9838f5df8192886607ee06aade0ac0ea Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 10 Oct 2012 09:02:50 -0400 Subject: [PATCH] Fix NPE in AbstractMessageConverterMethodProcessor Issue: SPR-9868 --- .../annotation/AbstractMessageConverterMethodProcessor.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java index d1aa721bbf1..ceca4efdf60 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java @@ -130,9 +130,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) messageConverter).write(returnValue, selectedMediaType, outputMessage);