Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert S-AMQP and SF to the latest Milestones

Browse Source 
See TODOs in the code of this change
This commit is contained in:
Artem Bilan
2016-04-25 14:37:24 -04:00
parent b3087b4fc8
commit 854a504a95
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-http/src/main/java/org/springframework/integration/http/multipart/SimpleMultipartFileReader.java
View File

@@ -51,7 +51,8 @@ public class SimpleMultipartFileReader implements MultipartFileReader<Object> {
public Object readMultipartFile(MultipartFile multipartFile) throws IOException {
if (multipartFile.getContentType() != null && multipartFile.getContentType().startsWith("text")) {
MediaType contentType = MediaType.parseMediaType(multipartFile.getContentType());
Charset charset = contentType.getCharset();
// TODO there is no yet in the SF-4.3.RC1 a MediaType.getCharset() method
Charset charset = contentType.getCharSet();
if (charset == null) {
charset = this.defaultCharset;
}