Make sure to fill the buffers as much as we can

usethesource · Sep 20, 2024 · ea2101a · ea2101a
1 parent 589aa9f
commit ea2101a
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/src/main/java/io/usethesource/vallang/impl/primitive/StringValue.java b/src/main/java/io/usethesource/vallang/impl/primitive/StringValue.java
@@ -1005,18 +1005,34 @@ public Reader asReader() {
                 final Iterator<CharBuffer> parts = iterateParts();
                 CharBuffer currentBuffer = CharBuffer.allocate(0);
 
-                @Override
-                public int read(char[] cbuf, int off, int len) throws IOException {
+                private CharBuffer getBuffer() {
                     var actualBuffer = currentBuffer;
                     while (!actualBuffer.hasRemaining()) {
                         if (!parts.hasNext()) {
-                            return -1;
+                            return actualBuffer;
                         }
                         actualBuffer = currentBuffer = parts.next();
                     }
-                    int actualLength = Math.min(len, actualBuffer.remaining());
-                    actualBuffer.get(cbuf, off, actualLength);
-                    return actualLength;
+                    return actualBuffer;
+                }
+
+                @Override
+                public int read(char[] cbuf, int off, int len) throws IOException {
+                    if (off < 0 || len < 0 || len > cbuf.length + off) {
+                        throw new IndexOutOfBoundsException();
+                    }
+                    int written = 0;
+                    while (written < len) {
+                        // we try to read as much as we can from the chunks of the buffer
+                        var actualBuffer = getBuffer();
+                        if (!actualBuffer.hasRemaining()) {
+                            break;
+                        }
+                        int toRead = Math.min(len - written, actualBuffer.remaining());
+                        actualBuffer.get(cbuf, off + written, toRead);
+                        written += toRead;
+                    }
+                    return written == 0 ? -1 : written;
                 }
 
                 @Override