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

Replace explicit use of PooledDataBuffer.release()

This commit is contained in:
Rossen Stoyanchev 2020-06-25 08:30:47 +01:00
parent 9d37794ebc
commit 3aaff40e2e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,7 +504,7 @@ public abstract class DataBufferUtils {
catch (IllegalStateException ex) { catch (IllegalStateException ex) {
// Avoid dependency on Netty: IllegalReferenceCountException // Avoid dependency on Netty: IllegalReferenceCountException
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Failed to release PooledDataBuffer", ex); logger.debug("Failed to release PooledDataBuffer: " + dataBuffer, ex);
} }
return false; return false;
} }

3
spring-web/src/main/java/org/springframework/http/codec/multipart/PartHttpMessageWriter.java
View File

@ -26,6 +26,7 @@ import org.springframework.core.ResolvableType;
import org.springframework.core.codec.Hints; import org.springframework.core.codec.Hints;
import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferFactory; import org.springframework.core.io.buffer.DataBufferFactory;
import org.springframework.core.io.buffer.DataBufferUtils;
import org.springframework.core.io.buffer.PooledDataBuffer; import org.springframework.core.io.buffer.PooledDataBuffer;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@ -66,7 +67,7 @@ public class PartHttpMessageWriter extends MultipartWriterSupport implements Htt
Flux<DataBuffer> body = Flux.from(parts) Flux<DataBuffer> body = Flux.from(parts)
.concatMap(part -> encodePart(boundary, part, outputMessage.bufferFactory())) .concatMap(part -> encodePart(boundary, part, outputMessage.bufferFactory()))
.concatWith(generateLastLine(boundary, outputMessage.bufferFactory())) .concatWith(generateLastLine(boundary, outputMessage.bufferFactory()))
.doOnDiscard(PooledDataBuffer.class, PooledDataBuffer::release); .doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
return outputMessage.writeWith(body); return outputMessage.writeWith(body);
} }