Fixed issue with DefaultDataBuffer.asInputStream()

master
Arjen Poutsma 9 years ago
parent f920d2ce1e
commit 2fcbeb6595
  1. 7
      spring-web-reactive/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java

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

Loading…
Cancel
Save