#12790 quick fix

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Mar 3, 2025 · e1a889d · e1a889d
1 parent dada868
commit e1a889d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/internal/QueuedPool.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/internal/QueuedPool.java
@@ -203,6 +203,7 @@ private static class QueuedEntry<P> implements Entry<P>
         // val/false -> idle
         // val/true  -> in use
         private final AtomicMarkableReference<P> pooled = new AtomicMarkableReference<>(null, false);
+        private P removedReference; // Only written before setting 'pooled', only read after getting 'pooled'.
 
         private QueuedEntry(QueuedPool<P> pool)
         {
@@ -243,7 +244,8 @@ public boolean enable(P pooled, boolean acquire)
         @Override
         public P getPooled()
         {
-            return pooled.getReference();
+            P reference = pooled.getReference();
+            return reference != null ? reference : removedReference;
         }
 
         void acquire()
@@ -273,6 +275,7 @@ public boolean remove()
             P p = pooled.get(inUse);
             if (p == null && inUse[0])
                 return false;
+            removedReference = p;
             pooled.set(null, true);
             return true;
         }

diff --git a/jetty-core/jetty-io/src/test/java/org/eclipse/jetty/io/ArrayByteBufferPoolTest.java b/jetty-core/jetty-io/src/test/java/org/eclipse/jetty/io/ArrayByteBufferPoolTest.java
@@ -42,7 +42,7 @@
 public class ArrayByteBufferPoolTest
 {
     @Test
-    public void testRemoveAndReleaseCompoundPool()
+    public void testRemoveAndReleaseFromCompoundPool()
     {
         int bufferCount = ConcurrentPool.OPTIMAL_MAX_SIZE * 2;
         List<RetainableByteBuffer> rbbs = new ArrayList<>();
@@ -61,8 +61,12 @@ public void testRemoveAndReleaseCompoundPool()
             RetainableByteBuffer rbb = pool.acquire(1, false);
             rbbs.add(rbb);
         }
-
         rbbs.forEach(pool::removeAndRelease);
+
+        for (RetainableByteBuffer rbb : rbbs)
+        {
+            assertThat(rbb.getByteBuffer(), notNullValue());
+        }
     }
 
     @Test

diff --git a/jetty-core/jetty-io/src/test/java/org/eclipse/jetty/io/internal/QueuedPoolTest.java b/jetty-core/jetty-io/src/test/java/org/eclipse/jetty/io/internal/QueuedPoolTest.java
@@ -75,6 +75,20 @@ public void testAcquireRelease()
         assertThat(e2.release(), is(false));
     }
 
+    @Test
+    public void testReleaseBeforeRemove()
+    {
+        Pool<String> pool = new QueuedPool<>(1);
+        pool.reserve().enable("aaa", false);
+
+        Pool.Entry<String> e1 = pool.acquire();
+
+        assertThat(e1.remove(), is(true));
+        assertThat(e1.remove(), is(false));
+        assertThat(e1.release(), is(false));
+        assertThat(e1.getPooled(), notNullValue());
+    }
+
     @Test
     public void testRemoveBeforeRelease()
     {
@@ -85,6 +99,7 @@ public void testRemoveBeforeRelease()
         assertThat(e1.remove(), is(true));
         assertThat(e1.remove(), is(false));
         assertThat(e1.release(), is(false));
+        assertThat(e1.getPooled(), notNullValue());
     }
 
     @Test