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

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Rossen Stoyanchev
2019-04-10 15:37:02 -04:00
parent 88e3b84164 bd2c213b47
commit bb28477587
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -532,13 +532,9 @@ public abstract class DataBufferUtils {
long pos = this.position.addAndGet(read);
dataBuffer.writePosition(read);
this.sink.next(dataBuffer);
// It's possible for cancellation to happen right before the push into the sink
// onNext may have led to onCancel (e.g. downstream takeUntil)
if (this.disposed.get()) {
// TODO:
// This is not ideal since we already passed the buffer into the sink and
// releasing may cause something reading to fail. Maybe we won't have to
// do this after https://github.com/reactor/reactor-core/issues/1634
complete(dataBuffer);
complete();
}
else {
DataBuffer newDataBuffer = this.dataBufferFactory.allocateBuffer(this.bufferSize);
@@ -547,12 +543,12 @@ public abstract class DataBufferUtils {
}
}
else {
complete(dataBuffer);
release(dataBuffer);
complete();
}
}
private void complete(DataBuffer dataBuffer) {
release(dataBuffer);
private void complete() {
this.sink.complete();
closeChannel(this.channel);
}