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

NettyDataBufferFactory.join returns single-element buffer as-is

Browse Source 
Issue: SPR-17560
This commit is contained in:
Juergen Hoeller
2018-12-03 23:52:35 +01:00
parent 7854b7ac40
commit d5dab12909
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBufferFactory.java
View File

@@ -31,6 +31,7 @@ import org.springframework.util.Assert;
* Netty {@link ByteBufAllocator}.
*
* @author Arjen Poutsma
* @author Juergen Hoeller
* @since 5.0
* @see io.netty.buffer.PooledByteBufAllocator
* @see io.netty.buffer.UnpooledByteBufAllocator
@@ -47,7 +48,7 @@ public class NettyDataBufferFactory implements DataBufferFactory {
* @see io.netty.buffer.UnpooledByteBufAllocator
*/
public NettyDataBufferFactory(ByteBufAllocator byteBufAllocator) {
Assert.notNull(byteBufAllocator, "'byteBufAllocator' must not be null");
Assert.notNull(byteBufAllocator, "ByteBufAllocator must not be null");
this.byteBufAllocator = byteBufAllocator;
}
@@ -97,8 +98,12 @@ public class NettyDataBufferFactory implements DataBufferFactory {
*/
@Override
public DataBuffer join(List<? extends DataBuffer> dataBuffers) {
Assert.notNull(dataBuffers, "'dataBuffers' must not be null");
CompositeByteBuf composite = this.byteBufAllocator.compositeBuffer(dataBuffers.size());
Assert.notEmpty(dataBuffers, "DataBuffer List must not be empty");
int bufferCount = dataBuffers.size();
if (bufferCount == 1) {
return dataBuffers.get(0);
}
CompositeByteBuf composite = this.byteBufAllocator.compositeBuffer(bufferCount);
for (DataBuffer dataBuffer : dataBuffers) {
Assert.isInstanceOf(NettyDataBuffer.class, dataBuffer);
composite.addComponent(true, ((NettyDataBuffer) dataBuffer).getNativeBuffer());
@@ -107,11 +112,11 @@ public class NettyDataBufferFactory implements DataBufferFactory {
}
/**
* Return the given Netty {@link DataBuffer} as a {@link ByteBuf}. Returns the
* {@linkplain NettyDataBuffer#getNativeBuffer() native buffer} if {@code buffer} is
* a {@link NettyDataBuffer}; returns {@link Unpooled#wrappedBuffer(ByteBuffer)}
* otherwise.
* @param buffer the {@code DataBuffer} to return a {@code ByteBuf} for.
* Return the given Netty {@link DataBuffer} as a {@link ByteBuf}.
* <p>Returns the {@linkplain NettyDataBuffer#getNativeBuffer() native buffer}
* if {@code buffer} is a {@link NettyDataBuffer}; returns
* {@link Unpooled#wrappedBuffer(ByteBuffer)} otherwise.
* @param buffer the {@code DataBuffer} to return a {@code ByteBuf} for
* @return the netty {@code ByteBuf}
*/
public static ByteBuf toByteBuf(DataBuffer buffer) {