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

Remove explicit subscribe in MultipartHttpMessageWriter 

Issue: SPR-16402
This commit is contained in:
Rossen Stoyanchev 2018-01-19 10:39:38 -05:00
parent 40127bd9ad
commit 09f1f727a7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java
View File

@ -272,13 +272,10 @@ public class MultipartHttpMessageWriter implements HttpMessageWriter<MultiValueM
Mono<Void> partWritten = ((HttpMessageWriter<T>) writer.get()) Mono<Void> partWritten = ((HttpMessageWriter<T>) writer.get())
.write(bodyPublisher, resolvableType, contentType, outputMessage, Collections.emptyMap()); .write(bodyPublisher, resolvableType, contentType, outputMessage, Collections.emptyMap());
// partWritten.subscribe() is required in order to make sure MultipartHttpOutputMessage#getBody()
// returns a non-null value (occurs with ResourceHttpMessageWriter that invokes
// ReactiveHttpOutputMessage.writeWith() only when at least one element has been requested).
partWritten.subscribe();
return Flux.concat( return Flux.concat(
Mono.just(generateBoundaryLine(boundary)), outputMessage.getBody(), Mono.just(generateNewLine())); Mono.just(generateBoundaryLine(boundary)),
partWritten.thenMany(Flux.defer(outputMessage::getBody)),
Mono.just(generateNewLine()));
} }