Update src/main/java/org/apache/commons/io/input/QueueInputStream.java

garydgregory · web-flow · commit ffd62ccd658f · 2025-05-18T14:30:12.000-04:00
diff --git a/src/main/java/org/apache/commons/io/input/QueueInputStream.java b/src/main/java/org/apache/commons/io/input/QueueInputStream.java
@@ -252,7 +252,7 @@ public int read(final byte[] b, final int offset, final int length) {
         } else if (length == 0) {
             return 0;
         }
-        final List<Integer> drain = new ArrayList<>(length);
+        final List<Integer> drain = new ArrayList<>(Math.min(length, blockingQueue.size()));
         blockingQueue.drainTo(drain, length);
         if (drain.isEmpty()) {
             // no data immediately available. wait for first byte

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public int read(final byte[] b, final int offset, final int length) {`
`252`	`252`	`} else if (length == 0) {`
`253`	`253`	`return 0;`
`254`	`254`	`}`
`255`		`- final List<Integer> drain = new ArrayList<>(length);`
	`255`	`+ final List<Integer> drain = new ArrayList<>(Math.min(length, blockingQueue.size()));`
`256`	`256`	`blockingQueue.drainTo(drain, length);`
`257`	`257`	`if (drain.isEmpty()) {`
`258`	`258`	`// no data immediately available. wait for first byte`