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

Correct charset determination in Synchronoss reader

Browse Source
This commit is contained in:
Rossen Stoyanchev
2017-05-04 13:30:56 -04:00
parent bb744574e5
commit bda2723933
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
View File

@@ -121,7 +121,12 @@ public class SynchronossPartHttpMessageReader implements HttpMessageReader<Part>
@Override
public void accept(FluxSink<Part> emitter) {
MultipartContext context = createMultipartContext();
HttpHeaders headers = this.inputMessage.getHeaders();
MediaType mediaType = headers.getContentType();
int length = Math.toIntExact(headers.getContentLength());
Charset charset = Optional.ofNullable(mediaType.getCharset()).orElse(StandardCharsets.UTF_8);
MultipartContext context = new MultipartContext(mediaType.toString(), length, charset.name());
NioMultipartParserListener listener = new FluxSinkAdapterListener(emitter, this.bufferFactory);
NioMultipartParser parser = Multipart.multipart(context).forNIO(listener);
@@ -152,16 +157,6 @@ public class SynchronossPartHttpMessageReader implements HttpMessageReader<Part>
});
}
private MultipartContext createMultipartContext() {
HttpHeaders headers = this.inputMessage.getHeaders();
String contentType = headers.getContentType().toString();
int contentLength = Math.toIntExact(headers.getContentLength());
String charset = headers.getFirst(HttpHeaders.ACCEPT_CHARSET);
return new MultipartContext(contentType, contentLength, charset);
}
}
/**
* Listen for parser output and adapt to {@code Flux<Sink<Part>>}.