Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.

jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferPool.java

@@ -19,13 +19,11 @@
 package org.eclipse.jetty.io;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Deque;
 import java.util.List;
-import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.eclipse.jetty.util.BufferUtil;
 
@@ -128,8 +126,7 @@ public interface ByteBufferPool
 
     class Bucket
     {
-        private final Lock _lock = new ReentrantLock();
+        private final Deque<ByteBuffer> _queue = new ConcurrentLinkedDeque<>();
-        private final Queue<ByteBuffer> _queue = new ArrayDeque<>();
         private final ByteBufferPool _pool;
         private final int _capacity;
         private final AtomicInteger _space;
@@ -181,72 +178,27 @@ public interface ByteBufferPool
 
         private void queueOffer(ByteBuffer buffer)
         {
-            Lock lock = _lock;
+            _queue.offerFirst(buffer);
-            lock.lock();
-            try
-            {
-                _queue.offer(buffer);
-            }
-            finally
-            {
-                lock.unlock();
-            }
         }
 
         private ByteBuffer queuePoll()
         {
-            Lock lock = _lock;
+            return _queue.poll();
-            lock.lock();
-            try
-            {
-                return _queue.poll();
-            }
-            finally
-            {
-                lock.unlock();
-            }
         }
 
         private void queueClear()
         {
-            Lock lock = _lock;
+            _queue.clear();
-            lock.lock();
-            try
-            {
-                _queue.clear();
-            }
-            finally
-            {
-                lock.unlock();
-            }
         }
 
         boolean isEmpty()
         {
-            Lock lock = _lock;
+            return _queue.isEmpty();
-            lock.lock();
-            try
-            {
-                return _queue.isEmpty();
-            }
-            finally
-            {
-                lock.unlock();
-            }
         }
 
         int size()
         {
-            Lock lock = _lock;
+            return _queue.size();
-            lock.lock();
-            try
-            {
-                return _queue.size();
-            }
-            finally
-            {
-                lock.unlock();
-            }
         }
 
         @Override