Issue #6974 - fix bug in ByteBufferPool implementations

If an allocation size of 0 was requested bucketFor would throw. Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Nov 26, 2021 · 377d0d1 · 377d0d1
1 parent c19921e
commit 377d0d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayByteBufferPool.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayByteBufferPool.java
@@ -197,7 +197,7 @@ protected void releaseMemory(boolean direct)
 
     protected int bucketFor(int capacity)
     {
-        return (int)Math.ceil((double)capacity / getCapacityFactor());
+        return Math.max((int)Math.ceil((double)capacity / getCapacityFactor()), 1);
     }
 
     protected int capacityFor(int bucket)

diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/MappedByteBufferPool.java b/jetty-io/src/main/java/org/eclipse/jetty/io/MappedByteBufferPool.java
@@ -176,7 +176,7 @@ protected void releaseMemory(boolean direct)
         }
         if (index >= 0)
         {
-            Bucket bucket = buckets.get(index);
+            Bucket bucket = buckets.remove(index);
             // Null guard in case this.clear() is called concurrently.
             if (bucket != null)
                 bucket.clear();
@@ -185,7 +185,7 @@ protected void releaseMemory(boolean direct)
 
     protected int bucketFor(int capacity)
     {
-        return (int)Math.ceil((double)capacity / getCapacityFactor());
+        return Math.max((int)Math.ceil((double)capacity / getCapacityFactor()), 1);
     }
 
     protected int capacityFor(int bucket)