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

Fixed issue with DefaultDataBuffer.asInputStream()

This commit is contained in:
Arjen Poutsma 2016-02-23 14:14:34 +01:00
parent f920d2ce1e
commit 2fcbeb6595
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web-reactive/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java
View File

@ -250,14 +250,15 @@ public class DefaultDataBuffer implements DataBuffer {
@Override
public int read() {
return readInternal(
buffer -> buffer.hasRemaining() ? buffer.get() & 0xFF : -1);
buffer -> readableByteCount() > 0 ? buffer.get() & 0xFF : -1);
}
@Override
public int read(byte[] bytes, int off, int len) throws IOException {
return readInternal(buffer -> {
if (buffer.hasRemaining()) {
int minLen = Math.min(len, buffer.remaining());
int count = readableByteCount();
if (count > 0) {
int minLen = Math.min(len, count);
buffer.get(bytes, off, minLen);
return minLen;
}