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

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Arjen Poutsma
2023-11-15 14:33:55 +01:00
parent ca9634143c 8868fe2ea5
commit 0ef3cb9b9e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,7 +313,7 @@ public class NettyDataBuffer implements PooledDataBuffer {
Assert.notNull(dest, "Dest must not be null"); Assert.notNull(dest, "Dest must not be null");
dest = dest.duplicate().clear(); dest = dest.duplicate().clear();
dest.put(destPos, this.byteBuf.nioBuffer(), srcPos, length); dest.put(destPos, this.byteBuf.nioBuffer(srcPos, length), 0, length);
} }
@Override @Override

15
spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferTests.java
View File

@@ -796,10 +796,6 @@ class DataBufferTests extends AbstractDataBufferAllocatingTests {
if (!(bufferFactory instanceof Netty5DataBufferFactory)) { if (!(bufferFactory instanceof Netty5DataBufferFactory)) {
assertThat(result).isEqualTo(new byte[]{'b', 'c'}); assertThat(result).isEqualTo(new byte[]{'b', 'c'});
} }
else {
assertThat(result).isEqualTo(new byte[]{'b', 0});
release(slice);
}
release(buffer); release(buffer);
} }
@@ -938,4 +934,15 @@ class DataBufferTests extends AbstractDataBufferAllocatingTests {
release(buffer); release(buffer);
} }
@ParameterizedDataBufferAllocatingTest // gh-31605
void shouldHonorSourceBuffersReadPosition(DataBufferFactory bufferFactory) {
DataBuffer dataBuffer = bufferFactory.wrap("ab".getBytes(StandardCharsets.UTF_8));
dataBuffer.readPosition(1);
ByteBuffer byteBuffer = ByteBuffer.allocate(dataBuffer.readableByteCount());
dataBuffer.toByteBuffer(byteBuffer);
assertThat(StandardCharsets.UTF_8.decode(byteBuffer).toString()).isEqualTo("b");
}
} }