ByteArrayStreamInput: Return -1 when there are no more bytes to read (#112214)

Author: chrisberkhout

docs/changelog/112214.yaml

@@ -0,0 +1,5 @@
+pr: 112214
+summary: '`ByteArrayStreamInput:` Return -1 when there are no more bytes to read'
+area: Infra/Core
+type: bug
+issues: []

server/src/main/java/org/elasticsearch/common/io/stream/ByteArrayStreamInput.java

@@ -120,7 +120,11 @@ public void readBytes(byte[] b, int offset, int len) {
 
     @Override
     public int read(byte[] b, int off, int len) throws IOException {
-        int toRead = Math.min(len, available());
+        final int available = limit - pos;
+        if (available <= 0) {
+            return -1;
+        }
+        int toRead = Math.min(len, available);
         readBytes(b, off, toRead);
         return toRead;
     }

server/src/test/java/org/elasticsearch/common/io/stream/AbstractStreamTests.java

@@ -723,6 +723,7 @@ public void testReadAfterReachingEndOfStream() throws IOException {
             input.readBytes(new byte[len], 0, len);
 
             assertEquals(-1, input.read());
+            assertEquals(-1, input.read(new byte[2], 0, 2));
         }
     }