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

Fix memory leak when canceling read from AsynchronousFileChannel

Browse Source 
This commit fixes a memory leak that occurs when reading from a
AsynchronousFileChannel, and cancelling the subscription.

Issue: SPR-17419
This commit is contained in:
Arjen Poutsma
2018-10-23 16:23:12 +02:00
parent 28cf7b728f
commit eac9e66c46
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,12 +139,14 @@ public abstract class DataBufferUtils {
DataBuffer dataBuffer = dataBufferFactory.allocateBuffer(bufferSize);
ByteBuffer byteBuffer = dataBuffer.asByteBuffer(0, bufferSize);
Flux<DataBuffer> result = Flux.using(channelSupplier,
channel -> Flux.create(sink -> {
CompletionHandler<Integer, DataBuffer> completionHandler =
AsynchronousFileChannelReadCompletionHandler completionHandler =
new AsynchronousFileChannelReadCompletionHandler(channel,
sink, position, dataBufferFactory, bufferSize);
channel.read(byteBuffer, position, dataBuffer, completionHandler);
sink.onDispose(completionHandler::dispose);
}),
DataBufferUtils::closeChannel);
@@ -545,6 +547,10 @@ public abstract class DataBufferUtils {
release(dataBuffer);
this.sink.error(exc);
}
public void dispose() {
this.disposed.set(true);
}
}