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

Upgrade to Reactor Core 3.1

Browse Source 
Issue: SPR-15318
This commit is contained in:
Sebastien Deleuze
2017-04-11 18:12:18 +02:00
parent f963367484
commit 4d9144132e
39 changed files with 215 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/core/codec/ResourceRegionEncoder.java
View File

@@ -85,7 +85,7 @@ public class ResourceRegionEncoder extends AbstractEncoder<ResourceRegion> {
if (inputStream instanceof Mono) {
return ((Mono<? extends ResourceRegion>) inputStream)
.flatMap(region -> writeResourceRegion(region, bufferFactory));
.flatMapMany(region -> writeResourceRegion(region, bufferFactory));
}
else {
Assert.notNull(hints, "'hints' must not be null");

2
spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
View File

@@ -114,7 +114,7 @@ public abstract class DataBufferUtils {
ByteBuffer byteBuffer = ByteBuffer.allocate(bufferSize);
return Flux.create(emitter -> {
emitter.setCancellation(() -> closeChannel(channel));
emitter.onDispose(() -> closeChannel(channel));
AsynchronousFileChannelCompletionHandler completionHandler =
new AsynchronousFileChannelCompletionHandler(emitter, position,
dataBufferFactory, byteBuffer);