From ccdd1a9efd30c41b07a66cab63f2c58190c42478 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Thu, 24 Jun 2010 09:15:50 +0000 Subject: [PATCH] SPR-7316 - remove "Accept-Charset" header from response, generated by @ResponseBody --- .../mvc/annotation/AnnotationMethodHandlerAdapter.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java index 3ff774b761d..d2dc8aed336 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java @@ -174,9 +174,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator private ModelAndViewResolver[] customModelAndViewResolvers; - private HttpMessageConverter[] messageConverters = - new HttpMessageConverter[]{new ByteArrayHttpMessageConverter(), new StringHttpMessageConverter(), - new SourceHttpMessageConverter(), new XmlAwareFormHttpMessageConverter()}; + private HttpMessageConverter[] messageConverters; private int order = Ordered.LOWEST_PRECEDENCE; @@ -191,6 +189,12 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator public AnnotationMethodHandlerAdapter() { // no restriction of HTTP methods by default super(false); + + // See SPR-7316 + StringHttpMessageConverter stringHttpMessageConverter = new StringHttpMessageConverter(); + stringHttpMessageConverter.setWriteAcceptCharset(false); + messageConverters = new HttpMessageConverter[]{new ByteArrayHttpMessageConverter(), stringHttpMessageConverter, + new SourceHttpMessageConverter(), new XmlAwareFormHttpMessageConverter()}; }