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

Remove buffer release used as workaround 

The extra buffer release was used as a workaround for a reactor core
issue and should have already been removed as part of
b3bc2d9253.
This commit is contained in:
Rossen Stoyanchev 2019-04-10 15:36:36 -04:00
parent 3ebbfa2191
commit bd2c213b47
1 changed files with 5 additions and 9 deletions
Show Stats 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

@ -524,13 +524,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);
@ -539,12 +535,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);
}