root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

CodecHttpMessageConverter supports a default charset

This commit is contained in:
Rossen Stoyanchev 2016-06-27 09:34:19 -04:00
parent 67175005e3
commit cbe2cbcc88
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web-reactive/src/main/java/org/springframework/http/converter/reactive/CodecHttpMessageConverter.java
View File

@ -144,6 +144,12 @@ public class CodecHttpMessageConverter<T> implements HttpMessageConverter<T> {
contentTypeToUse = (mediaType != null ? mediaType : contentTypeToUse); contentTypeToUse = (mediaType != null ? mediaType : contentTypeToUse);
} }
if (contentTypeToUse != null) { if (contentTypeToUse != null) {
if (contentTypeToUse.getCharset() == null) {
MediaType mediaType = getDefaultContentType(type);
if (mediaType != null && mediaType.getCharset() != null) {
contentTypeToUse = new MediaType(contentTypeToUse, mediaType.getCharset());
}
}
headers.setContentType(contentTypeToUse); headers.setContentType(contentTypeToUse);
} }
} }