From c14bf735a2dc0698546a1ff1548d2d3d7a5c8675 Mon Sep 17 00:00:00 2001
From: bkmz <ilya.cherkasov@gmail.com>
Date: Tue, 2 Apr 2019 11:56:46 +0300
Subject: [PATCH 1/8] Compression pool for PermessageDeflate extensions for
 websockets

- Implements Compression Pool (based on apache Commons Pool)
- Implements Inflater Pool
- Plugs Compression Pools usage in Permessage-Deflate

Signed-off-by: bkmz <ilya.cherkasov@gmail.com>
---
 .../server/jmh/DeflaterPoolBenchmark.java     |   2 +-
 .../eclipse/jetty/server/DeflaterPool.java    | 129 -------------
 .../server/handler/gzip/GzipHandler.java      |   2 +-
 jetty-util/pom.xml                            |   4 +
 .../eclipse/jetty/util/CompressionPool.java   | 170 ++++++++++++++++++
 .../org/eclipse/jetty/util/DeflaterPool.java  |  79 ++++++++
 .../org/eclipse/jetty/util/InflaterPool.java  |  76 ++++++++
 .../compress/CompressExtension.java           |  17 +-
 pom.xml                                       |   5 +
 9 files changed, 348 insertions(+), 136 deletions(-)
 delete mode 100644 jetty-server/src/main/java/org/eclipse/jetty/server/DeflaterPool.java
 create mode 100644 jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java
 create mode 100644 jetty-util/src/main/java/org/eclipse/jetty/util/DeflaterPool.java
 create mode 100644 jetty-util/src/main/java/org/eclipse/jetty/util/InflaterPool.java

diff --git a/jetty-jmh/src/main/java/org/eclipse/jetty/server/jmh/DeflaterPoolBenchmark.java b/jetty-jmh/src/main/java/org/eclipse/jetty/server/jmh/DeflaterPoolBenchmark.java
index 784abd908c7..a11bb8df71a 100644
--- a/jetty-jmh/src/main/java/org/eclipse/jetty/server/jmh/DeflaterPoolBenchmark.java
+++ b/jetty-jmh/src/main/java/org/eclipse/jetty/server/jmh/DeflaterPoolBenchmark.java
@@ -21,7 +21,7 @@ package org.eclipse.jetty.server.jmh;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.Deflater;
 
-import org.eclipse.jetty.server.DeflaterPool;
+import org.eclipse.jetty.util.DeflaterPool;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Level;
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/DeflaterPool.java b/jetty-server/src/main/java/org/eclipse/jetty/server/DeflaterPool.java
deleted file mode 100644
index 27f4070421f..00000000000
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/DeflaterPool.java
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package org.eclipse.jetty.server;
-
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.zip.Deflater;
-
-public class DeflaterPool
-{
-    private final Queue<Deflater> _pool;
-    private final int _compressionLevel;
-    private final boolean _nowrap;
-    private final AtomicInteger _numDeflaters = new AtomicInteger(0);
-    private final int _capacity;
-
-
-    /**
-     * Create a Pool of {@link Deflater} instances.
-     *
-     * If given a capacity equal to zero the Deflaters will not be pooled
-     * and will be created on acquire and ended on release.
-     * If given a negative capacity equal to zero there will be no size restrictions on the DeflaterPool
-     *
-     * @param capacity maximum number of Deflaters which can be contained in the pool
-     * @param compressionLevel the default compression level for new Deflater objects
-     * @param nowrap if true then use GZIP compatible compression for all new Deflater objects
-     */
-    public DeflaterPool(int capacity, int compressionLevel, boolean nowrap)
-    {
-        _capacity = capacity;
-        _compressionLevel = compressionLevel;
-        _nowrap = nowrap;
-
-        if (_capacity != 0)
-            _pool = new ConcurrentLinkedQueue<>();
-        else
-            _pool = null;
-    }
-
-    protected Deflater newDeflater()
-    {
-        return new Deflater(_compressionLevel, _nowrap);
-    }
-
-    /**
-     * @return Deflater taken from the pool if it is not empty or a newly created Deflater
-     */
-    public Deflater acquire()
-    {
-        Deflater deflater;
-
-        if (_capacity == 0)
-            deflater = newDeflater();
-        else if (_capacity < 0)
-        {
-            deflater = _pool.poll();
-            if (deflater == null)
-                deflater = newDeflater();
-        }
-        else
-        {
-            deflater = _pool.poll();
-            if (deflater == null)
-                deflater = newDeflater();
-            else
-                _numDeflaters.decrementAndGet();
-        }
-
-        return deflater;
-    }
-
-    /**
-     * @param deflater returns this Deflater to the pool or calls deflater.end() if the pool is full.
-     */
-    public void release(Deflater deflater)
-    {
-        if (deflater == null)
-            return;
-
-        if (_capacity == 0)
-        {
-            deflater.end();
-            return;
-        }
-        else if (_capacity < 0)
-        {
-            deflater.reset();
-            _pool.add(deflater);
-        }
-        else
-        {
-            while (true)
-            {
-                int d = _numDeflaters.get();
-
-                if (d >= _capacity)
-                {
-                    deflater.end();
-                    break;
-                }
-
-                if (_numDeflaters.compareAndSet(d, d + 1))
-                {
-                    deflater.reset();
-                    _pool.add(deflater);
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
index 34f555c9c6a..9c9b58c8513 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.http.*;
 import org.eclipse.jetty.http.pathmap.PathSpecSet;
-import org.eclipse.jetty.server.DeflaterPool;
+import org.eclipse.jetty.util.DeflaterPool;
 import org.eclipse.jetty.server.HttpOutput;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index d3fe35cd21a..6da82ecbfe2 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -91,6 +91,10 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+    </dependency>
     <!--
       This dependency is used to test Slf4jLog.
       Due to the introduction of src/test/resource/jetty-logging.properties (and the Log.static{} block)
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java
new file mode 100644
index 00000000000..3dd228dc528
--- /dev/null
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java
@@ -0,0 +1,170 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.util;
+
+import org.apache.commons.pool.ObjectPool;
+import org.apache.commons.pool.PoolableObjectFactory;
+import org.apache.commons.pool.impl.GenericObjectPool;
+
+import java.util.concurrent.TimeUnit;
+import java.util.zip.Deflater;
+import java.util.zip.Inflater;
+
+public class CompressionPool
+{
+    private CompressionPool()
+    {
+    }
+
+    public static ObjectPool<Inflater> limitedInflaterPool(int capacity, boolean nowrap)
+    {
+        return new GenericObjectPool<>(new InflaterPoolFactory(nowrap), blockingBorrowPoolConfig(capacity));
+    }
+
+    public static ObjectPool<Inflater> growingInflaterPool(boolean nowrap)
+    {
+        return new GenericObjectPool<>(new InflaterPoolFactory(nowrap), defaultPoolConfig());
+    }
+
+    public static ObjectPool<Deflater> limitedDeflaterPool(int capacity, int compressionLevel, boolean nowrap)
+    {
+        return new GenericObjectPool<>(new DeflaterPoolFactory(compressionLevel, nowrap),
+                blockingBorrowPoolConfig(capacity));
+    }
+
+    public static ObjectPool<Deflater> growingDeflaterPool(int compressionLevel, boolean nowrap)
+    {
+        return new GenericObjectPool<>(new DeflaterPoolFactory(compressionLevel, nowrap),
+                defaultPoolConfig());
+    }
+
+    private static GenericObjectPool.Config blockingBorrowPoolConfig(int capacity)
+    {
+        GenericObjectPool.Config config = new GenericObjectPool.Config();
+
+        config.maxActive = capacity;
+        config.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_BLOCK;
+        config.minEvictableIdleTimeMillis = TimeUnit.SECONDS.toMillis(1);
+        config.timeBetweenEvictionRunsMillis = TimeUnit.SECONDS.toMillis(5);
+        config.testOnBorrow = true;
+        config.testOnReturn = false;
+        config.testWhileIdle = false;
+
+        return config;
+    }
+
+    private static GenericObjectPool.Config defaultPoolConfig()
+    {
+        GenericObjectPool.Config config = new GenericObjectPool.Config();
+
+        config.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_GROW;
+        config.minEvictableIdleTimeMillis = TimeUnit.SECONDS.toMillis(5);
+        config.timeBetweenEvictionRunsMillis = TimeUnit.SECONDS.toMillis(30);
+        config.testOnBorrow = true;
+        config.testOnReturn = false;
+        config.testWhileIdle = false;
+
+        return config;
+    }
+
+    private static class DeflaterPoolFactory implements PoolableObjectFactory<Deflater>
+    {
+        private final int compressionLevel;
+        private final boolean nowrap;
+
+        DeflaterPoolFactory(int compressionLevel, boolean nowrap)
+        {
+            this.compressionLevel = compressionLevel;
+            this.nowrap = nowrap;
+        }
+
+        @Override
+        public Deflater makeObject() throws Exception
+        {
+            return new Deflater(compressionLevel, nowrap);
+        }
+
+        @Override
+        public void destroyObject(Deflater obj) throws Exception
+        {
+            obj.reset();
+            obj.end();
+        }
+
+        @Override
+        public boolean validateObject(Deflater obj)
+        {
+            return !obj.finished();
+        }
+
+        @Override
+        public void activateObject(Deflater obj) throws Exception
+        {
+        }
+
+        @Override
+        public void passivateObject(Deflater obj) throws Exception
+        {
+            obj.reset();
+        }
+    }
+
+
+    private static class InflaterPoolFactory implements PoolableObjectFactory<Inflater>
+    {
+        private final boolean nowrap;
+
+        InflaterPoolFactory(boolean nowrap)
+        {
+            this.nowrap = nowrap;
+        }
+
+        @Override
+        public Inflater makeObject() throws Exception
+        {
+            return new Inflater(nowrap);
+        }
+
+        @Override
+        public void destroyObject(Inflater obj) throws Exception
+        {
+            obj.reset();
+            obj.end();
+        }
+
+        @Override
+        public boolean validateObject(Inflater obj)
+        {
+            return !obj.finished();
+        }
+
+        @Override
+        public void activateObject(Inflater obj) throws Exception
+        {
+        }
+
+        @Override
+        public void passivateObject(Inflater obj) throws Exception
+        {
+            obj.reset();
+        }
+    }
+
+
+}
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/DeflaterPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/DeflaterPool.java
new file mode 100644
index 00000000000..79733f3e5c3
--- /dev/null
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/DeflaterPool.java
@@ -0,0 +1,79 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.util;
+
+import org.apache.commons.pool.ObjectPool;
+
+import java.util.zip.Deflater;
+
+public class DeflaterPool
+{
+    private final ObjectPool<Deflater> deflaterPool;
+
+    /**
+     * Create a Pool of {@link Deflater} instances.
+     * <p>
+     * If given a capacity equal to zero the Deflaters will not be pooled
+     * and will be created on acquire and ended on release.
+     * If given a negative capacity equal to zero there will be no size restrictions on the DeflaterPool
+     *
+     * @param capacity         maximum number of Deflaters which can be contained in the pool
+     * @param compressionLevel the default compression level for new Deflater objects
+     * @param nowrap           if true then use GZIP compatible compression for all new Deflater objects
+     */
+    public DeflaterPool(int capacity, int compressionLevel, boolean nowrap)
+    {
+        deflaterPool = capacity <= 0
+                ? CompressionPool.growingDeflaterPool(compressionLevel, nowrap)
+                : CompressionPool.limitedDeflaterPool(capacity, compressionLevel, nowrap);
+    }
+
+    /**
+     * @return Deflater taken from the pool if it is not empty or a newly created Deflater
+     */
+    public Deflater acquire()
+    {
+        try
+        {
+            return deflaterPool.borrowObject();
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * @param deflater returns this Deflater to the pool or calls deflater.end() if the pool is full.
+     */
+    public void release(Deflater deflater)
+    {
+        if (deflater == null)
+            return;
+
+        try
+        {
+            deflaterPool.returnObject(deflater);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/InflaterPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/InflaterPool.java
new file mode 100644
index 00000000000..79dcb175126
--- /dev/null
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/InflaterPool.java
@@ -0,0 +1,76 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.util;
+
+import org.apache.commons.pool.ObjectPool;
+
+import java.util.zip.Inflater;
+
+public class InflaterPool
+{
+
+    private final ObjectPool<Inflater> inflaterPool;
+
+    /**
+     * Create a Pool of {@link Inflater} instances.
+     * <p>
+     * If given a capacity equal to zero the Inflaters will not be pooled
+     * and will be created on acquire and ended on release.
+     * If given a negative capacity equal to zero there will be no size restrictions on the InflaterPool
+     *
+     * @param capacity maximum number of Inflaters which can be contained in the pool
+     * @param nowrap   if true then use GZIP compatible compression for all new Inflater objects
+     */
+    public InflaterPool(int capacity, boolean nowrap)
+    {
+        inflaterPool = (capacity <= 0)
+                ? CompressionPool.growingInflaterPool(nowrap)
+                : CompressionPool.limitedInflaterPool(capacity, nowrap);
+    }
+
+    /**
+     * @return Inflater taken from the pool if it is not empty or a newly created Inflater
+     */
+    public Inflater acquire()
+    {
+        try
+        {
+            return inflaterPool.borrowObject();
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * @param inflater returns this Inflater to the pool or calls inflater.end() if the pool is full.
+     */
+    public void release(Inflater inflater)
+    {
+        try
+        {
+            inflaterPool.returnObject(inflater);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
index 53c1189dd21..e6c7de4b3cd 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
@@ -29,6 +29,8 @@ import java.util.zip.Inflater;
 import java.util.zip.ZipException;
 
 import org.eclipse.jetty.util.BufferUtil;
+import org.eclipse.jetty.util.DeflaterPool;
+import org.eclipse.jetty.util.InflaterPool;
 import org.eclipse.jetty.util.IteratingCallback;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
@@ -71,6 +73,11 @@ public abstract class CompressExtension extends AbstractExtension
     private static final int DECOMPRESS_BUF_SIZE = 8 * 1024;
     
     private final static boolean NOWRAP = true;
+    private final static int POOL_CAPACITY = -1;
+
+    private static final DeflaterPool deflaterPool = new DeflaterPool(POOL_CAPACITY,
+            Deflater.DEFAULT_COMPRESSION, NOWRAP);
+    private static final InflaterPool inflaterPool = new InflaterPool(POOL_CAPACITY, NOWRAP);
 
     private final Queue<FrameEntry> entries = new ArrayDeque<>();
     private final IteratingCallback flusher = new Flusher();
@@ -90,7 +97,7 @@ public abstract class CompressExtension extends AbstractExtension
     {
         if (deflaterImpl == null)
         {
-            deflaterImpl = new Deflater(Deflater.DEFAULT_COMPRESSION,NOWRAP);
+            deflaterImpl = deflaterPool.acquire();
         }
         return deflaterImpl;
     }
@@ -99,7 +106,7 @@ public abstract class CompressExtension extends AbstractExtension
     {
         if (inflaterImpl == null)
         {
-            inflaterImpl = new Inflater(NOWRAP);
+            inflaterImpl = inflaterPool.acquire();
         }
         return inflaterImpl;
     }
@@ -370,14 +377,14 @@ public abstract class CompressExtension extends AbstractExtension
         }
         return true;
     }
-    
+
     @Override
     protected void doStop() throws Exception
     {
         if(deflaterImpl != null)
-            deflaterImpl.end();
+            deflaterPool.release(deflaterImpl);
         if(inflaterImpl != null)
-            inflaterImpl.end();
+            inflaterPool.release(inflaterImpl);
         super.doStop();
     }
 
diff --git a/pom.xml b/pom.xml
index 822f5fce5ed..45f06084457 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1068,6 +1068,11 @@
         <artifactId>hamcrest-library</artifactId>
         <version>1.3</version>
       </dependency>
+      <dependency>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <version>1.6</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

From e41906fbdbb61b9a447290c67261202c3f7d29ff Mon Sep 17 00:00:00 2001
From: bkmz <ilya.cherkasov@gmail.com>
Date: Thu, 4 Apr 2019 13:52:53 +0300
Subject: [PATCH 2/8] Bug and build fixes:

- Fixes deflater/inflater pool validation
- Removes validation tests of Flators for pool
- Eroding pool usage; fixes cleanup of Deflaters

Signed-off-by: bkmz <ilya.cherkasov@gmail.com>
---
 .../eclipse/jetty/util/CompressionPool.java   | 31 +++++++++----------
 .../compress/CompressExtension.java           |  8 +++++
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java
index 3dd228dc528..dd6551f5f38 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java
@@ -19,6 +19,7 @@
 package org.eclipse.jetty.util;
 
 import org.apache.commons.pool.ObjectPool;
+import org.apache.commons.pool.PoolUtils;
 import org.apache.commons.pool.PoolableObjectFactory;
 import org.apache.commons.pool.impl.GenericObjectPool;
 
@@ -39,7 +40,10 @@ public class CompressionPool
 
     public static ObjectPool<Inflater> growingInflaterPool(boolean nowrap)
     {
-        return new GenericObjectPool<>(new InflaterPoolFactory(nowrap), defaultPoolConfig());
+        GenericObjectPool<Inflater> objectPool = new GenericObjectPool<>(
+                new InflaterPoolFactory(nowrap), growingPoolConfig());
+
+        return PoolUtils.erodingPool(objectPool);
     }
 
     public static ObjectPool<Deflater> limitedDeflaterPool(int capacity, int compressionLevel, boolean nowrap)
@@ -50,8 +54,10 @@ public class CompressionPool
 
     public static ObjectPool<Deflater> growingDeflaterPool(int compressionLevel, boolean nowrap)
     {
-        return new GenericObjectPool<>(new DeflaterPoolFactory(compressionLevel, nowrap),
-                defaultPoolConfig());
+        GenericObjectPool<Deflater> objectPool = new GenericObjectPool<>(
+                new DeflaterPoolFactory(compressionLevel, nowrap), growingPoolConfig());
+
+        return PoolUtils.erodingPool(objectPool);
     }
 
     private static GenericObjectPool.Config blockingBorrowPoolConfig(int capacity)
@@ -62,23 +68,14 @@ public class CompressionPool
         config.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_BLOCK;
         config.minEvictableIdleTimeMillis = TimeUnit.SECONDS.toMillis(1);
         config.timeBetweenEvictionRunsMillis = TimeUnit.SECONDS.toMillis(5);
-        config.testOnBorrow = true;
-        config.testOnReturn = false;
-        config.testWhileIdle = false;
 
         return config;
     }
 
-    private static GenericObjectPool.Config defaultPoolConfig()
+    private static GenericObjectPool.Config growingPoolConfig()
     {
         GenericObjectPool.Config config = new GenericObjectPool.Config();
-
         config.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_GROW;
-        config.minEvictableIdleTimeMillis = TimeUnit.SECONDS.toMillis(5);
-        config.timeBetweenEvictionRunsMillis = TimeUnit.SECONDS.toMillis(30);
-        config.testOnBorrow = true;
-        config.testOnReturn = false;
-        config.testWhileIdle = false;
 
         return config;
     }
@@ -103,14 +100,14 @@ public class CompressionPool
         @Override
         public void destroyObject(Deflater obj) throws Exception
         {
-            obj.reset();
             obj.end();
         }
 
         @Override
         public boolean validateObject(Deflater obj)
         {
-            return !obj.finished();
+            // currently it's not possible to understand if deflater had been finalized.
+            return true;
         }
 
         @Override
@@ -144,14 +141,14 @@ public class CompressionPool
         @Override
         public void destroyObject(Inflater obj) throws Exception
         {
-            obj.reset();
             obj.end();
         }
 
         @Override
         public boolean validateObject(Inflater obj)
         {
-            return !obj.finished();
+            // currently it's not possible to understand if inflater had been finalized.
+            return true;
         }
 
         @Override
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
index e6c7de4b3cd..b0bd97b846d 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
@@ -382,9 +382,17 @@ public abstract class CompressExtension extends AbstractExtension
     protected void doStop() throws Exception
     {
         if(deflaterImpl != null)
+        {
             deflaterPool.release(deflaterImpl);
+            deflaterImpl = null;
+        }
+        
         if(inflaterImpl != null)
+        {
             inflaterPool.release(inflaterImpl);
+            inflaterImpl = null;
+        }
+
         super.doStop();
     }
 

From e8115268d45e52ff4598b613aa68161505c0ad52 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Wed, 12 Jun 2019 14:21:40 +1000
Subject: [PATCH 3/8] Issue #300 - rework of inflater and deflater pools

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../server/jmh/DeflaterPoolBenchmark.java     |   2 +-
 .../server/handler/gzip/GzipHandler.java      |  11 +-
 jetty-util/pom.xml                            |   4 -
 .../eclipse/jetty/util/CompressionPool.java   | 167 ------------------
 .../util/compression/CompressionPool.java     | 118 +++++++++++++
 .../util/{ => compression}/DeflaterPool.java  |  52 ++----
 .../util/{ => compression}/InflaterPool.java  |  50 ++----
 .../compress/CompressExtension.java           |   4 +-
 pom.xml                                       |   5 -
 9 files changed, 165 insertions(+), 248 deletions(-)
 delete mode 100644 jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java
 create mode 100644 jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
 rename jetty-util/src/main/java/org/eclipse/jetty/util/{ => compression}/DeflaterPool.java (59%)
 rename jetty-util/src/main/java/org/eclipse/jetty/util/{ => compression}/InflaterPool.java (59%)

diff --git a/jetty-jmh/src/main/java/org/eclipse/jetty/server/jmh/DeflaterPoolBenchmark.java b/jetty-jmh/src/main/java/org/eclipse/jetty/server/jmh/DeflaterPoolBenchmark.java
index a11bb8df71a..d9ddf0f8f21 100644
--- a/jetty-jmh/src/main/java/org/eclipse/jetty/server/jmh/DeflaterPoolBenchmark.java
+++ b/jetty-jmh/src/main/java/org/eclipse/jetty/server/jmh/DeflaterPoolBenchmark.java
@@ -21,7 +21,7 @@ package org.eclipse.jetty.server.jmh;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.Deflater;
 
-import org.eclipse.jetty.util.DeflaterPool;
+import org.eclipse.jetty.util.compression.DeflaterPool;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Level;
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
index 9c9b58c8513..33f21d93cc8 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
@@ -26,15 +26,21 @@ import java.util.ListIterator;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.zip.Deflater;
+
 import javax.servlet.DispatcherType;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.jetty.http.*;
+import org.eclipse.jetty.http.CompressedContentFormat;
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpHeaderValue;
+import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.http.MimeTypes;
+import org.eclipse.jetty.http.PreEncodedHttpField;
 import org.eclipse.jetty.http.pathmap.PathSpecSet;
-import org.eclipse.jetty.util.DeflaterPool;
 import org.eclipse.jetty.server.HttpOutput;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
@@ -42,6 +48,7 @@ import org.eclipse.jetty.util.IncludeExclude;
 import org.eclipse.jetty.util.RegexSet;
 import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.util.URIUtil;
+import org.eclipse.jetty.util.compression.DeflaterPool;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 6da82ecbfe2..d3fe35cd21a 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -91,10 +91,6 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>commons-pool</groupId>
-      <artifactId>commons-pool</artifactId>
-    </dependency>
     <!--
       This dependency is used to test Slf4jLog.
       Due to the introduction of src/test/resource/jetty-logging.properties (and the Log.static{} block)
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java
deleted file mode 100644
index dd6551f5f38..00000000000
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/CompressionPool.java
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package org.eclipse.jetty.util;
-
-import org.apache.commons.pool.ObjectPool;
-import org.apache.commons.pool.PoolUtils;
-import org.apache.commons.pool.PoolableObjectFactory;
-import org.apache.commons.pool.impl.GenericObjectPool;
-
-import java.util.concurrent.TimeUnit;
-import java.util.zip.Deflater;
-import java.util.zip.Inflater;
-
-public class CompressionPool
-{
-    private CompressionPool()
-    {
-    }
-
-    public static ObjectPool<Inflater> limitedInflaterPool(int capacity, boolean nowrap)
-    {
-        return new GenericObjectPool<>(new InflaterPoolFactory(nowrap), blockingBorrowPoolConfig(capacity));
-    }
-
-    public static ObjectPool<Inflater> growingInflaterPool(boolean nowrap)
-    {
-        GenericObjectPool<Inflater> objectPool = new GenericObjectPool<>(
-                new InflaterPoolFactory(nowrap), growingPoolConfig());
-
-        return PoolUtils.erodingPool(objectPool);
-    }
-
-    public static ObjectPool<Deflater> limitedDeflaterPool(int capacity, int compressionLevel, boolean nowrap)
-    {
-        return new GenericObjectPool<>(new DeflaterPoolFactory(compressionLevel, nowrap),
-                blockingBorrowPoolConfig(capacity));
-    }
-
-    public static ObjectPool<Deflater> growingDeflaterPool(int compressionLevel, boolean nowrap)
-    {
-        GenericObjectPool<Deflater> objectPool = new GenericObjectPool<>(
-                new DeflaterPoolFactory(compressionLevel, nowrap), growingPoolConfig());
-
-        return PoolUtils.erodingPool(objectPool);
-    }
-
-    private static GenericObjectPool.Config blockingBorrowPoolConfig(int capacity)
-    {
-        GenericObjectPool.Config config = new GenericObjectPool.Config();
-
-        config.maxActive = capacity;
-        config.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_BLOCK;
-        config.minEvictableIdleTimeMillis = TimeUnit.SECONDS.toMillis(1);
-        config.timeBetweenEvictionRunsMillis = TimeUnit.SECONDS.toMillis(5);
-
-        return config;
-    }
-
-    private static GenericObjectPool.Config growingPoolConfig()
-    {
-        GenericObjectPool.Config config = new GenericObjectPool.Config();
-        config.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_GROW;
-
-        return config;
-    }
-
-    private static class DeflaterPoolFactory implements PoolableObjectFactory<Deflater>
-    {
-        private final int compressionLevel;
-        private final boolean nowrap;
-
-        DeflaterPoolFactory(int compressionLevel, boolean nowrap)
-        {
-            this.compressionLevel = compressionLevel;
-            this.nowrap = nowrap;
-        }
-
-        @Override
-        public Deflater makeObject() throws Exception
-        {
-            return new Deflater(compressionLevel, nowrap);
-        }
-
-        @Override
-        public void destroyObject(Deflater obj) throws Exception
-        {
-            obj.end();
-        }
-
-        @Override
-        public boolean validateObject(Deflater obj)
-        {
-            // currently it's not possible to understand if deflater had been finalized.
-            return true;
-        }
-
-        @Override
-        public void activateObject(Deflater obj) throws Exception
-        {
-        }
-
-        @Override
-        public void passivateObject(Deflater obj) throws Exception
-        {
-            obj.reset();
-        }
-    }
-
-
-    private static class InflaterPoolFactory implements PoolableObjectFactory<Inflater>
-    {
-        private final boolean nowrap;
-
-        InflaterPoolFactory(boolean nowrap)
-        {
-            this.nowrap = nowrap;
-        }
-
-        @Override
-        public Inflater makeObject() throws Exception
-        {
-            return new Inflater(nowrap);
-        }
-
-        @Override
-        public void destroyObject(Inflater obj) throws Exception
-        {
-            obj.end();
-        }
-
-        @Override
-        public boolean validateObject(Inflater obj)
-        {
-            // currently it's not possible to understand if inflater had been finalized.
-            return true;
-        }
-
-        @Override
-        public void activateObject(Inflater obj) throws Exception
-        {
-        }
-
-        @Override
-        public void passivateObject(Inflater obj) throws Exception
-        {
-            obj.reset();
-        }
-    }
-
-
-}
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
new file mode 100644
index 00000000000..d05fb86f692
--- /dev/null
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
@@ -0,0 +1,118 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.util.compression;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public abstract class CompressionPool<T>
+{
+    private final Queue<T> _pool;
+    private final AtomicInteger _numObjects = new AtomicInteger(0);
+    private final int _capacity;
+
+    /**
+     * Create a Pool of {@link T} instances.
+     *
+     * If given a capacity equal to zero the Objects will not be pooled
+     * and will be created on acquire and ended on release.
+     * If given a negative capacity equal to zero there will be no size restrictions on the Pool
+     *
+     * @param capacity maximum number of Objects which can be contained in the pool
+     */
+    public CompressionPool(int capacity)
+    {
+        _capacity = capacity;
+        _pool = (_capacity==0) ? null : new ConcurrentLinkedQueue<>();
+    }
+
+    abstract protected T newObject();
+
+    abstract protected void end(T object);
+
+    abstract protected void reset(T object);
+
+    /**
+     * @return Object taken from the pool if it is not empty or a newly created Object
+     */
+    public T acquire()
+    {
+        T object;
+
+        if (_capacity == 0)
+            object = newObject();
+        else if (_capacity < 0)
+        {
+            object = _pool.poll();
+            if (object == null)
+                object = newObject();
+        }
+        else
+        {
+            object = _pool.poll();
+            if (object == null)
+                object = newObject();
+            else
+                _numObjects.decrementAndGet();
+        }
+
+        return object;
+    }
+
+    /**
+     * @param object returns this Object to the pool or calls {@link #end(T)} if the pool is full.
+     */
+    public void release(T object)
+    {
+        if (object == null)
+            return;
+
+        if (_capacity == 0)
+        {
+            end(object);
+            return;
+        }
+        else if (_capacity < 0)
+        {
+            reset(object);
+            _pool.add(object);
+        }
+        else
+        {
+            while (true)
+            {
+                int d = _numObjects.get();
+
+                if (d >= _capacity)
+                {
+                    end(object);
+                    break;
+                }
+
+                if (_numObjects.compareAndSet(d, d + 1))
+                {
+                    reset(object);
+                    _pool.add(object);
+                    break;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/DeflaterPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/DeflaterPool.java
similarity index 59%
rename from jetty-util/src/main/java/org/eclipse/jetty/util/DeflaterPool.java
rename to jetty-util/src/main/java/org/eclipse/jetty/util/compression/DeflaterPool.java
index 79733f3e5c3..8676a4b1680 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/DeflaterPool.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/DeflaterPool.java
@@ -16,15 +16,14 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.util;
-
-import org.apache.commons.pool.ObjectPool;
+package org.eclipse.jetty.util.compression;
 
 import java.util.zip.Deflater;
 
-public class DeflaterPool
+public class DeflaterPool extends CompressionPool<Deflater>
 {
-    private final ObjectPool<Deflater> deflaterPool;
+    private final int compressionLevel;
+    private final boolean nowrap;
 
     /**
      * Create a Pool of {@link Deflater} instances.
@@ -39,41 +38,26 @@ public class DeflaterPool
      */
     public DeflaterPool(int capacity, int compressionLevel, boolean nowrap)
     {
-        deflaterPool = capacity <= 0
-                ? CompressionPool.growingDeflaterPool(compressionLevel, nowrap)
-                : CompressionPool.limitedDeflaterPool(capacity, compressionLevel, nowrap);
+        super(capacity);
+        this.compressionLevel = compressionLevel;
+        this.nowrap = nowrap;
     }
 
-    /**
-     * @return Deflater taken from the pool if it is not empty or a newly created Deflater
-     */
-    public Deflater acquire()
+    @Override
+    protected Deflater newObject()
     {
-        try
-        {
-            return deflaterPool.borrowObject();
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e);
-        }
+        return new Deflater(compressionLevel, nowrap);
     }
 
-    /**
-     * @param deflater returns this Deflater to the pool or calls deflater.end() if the pool is full.
-     */
-    public void release(Deflater deflater)
+    @Override
+    protected void end(Deflater deflater)
     {
-        if (deflater == null)
-            return;
+        deflater.end();
+    }
 
-        try
-        {
-            deflaterPool.returnObject(deflater);
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e);
-        }
+    @Override
+    protected void reset(Deflater deflater)
+    {
+        deflater.reset();
     }
 }
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/InflaterPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/InflaterPool.java
similarity index 59%
rename from jetty-util/src/main/java/org/eclipse/jetty/util/InflaterPool.java
rename to jetty-util/src/main/java/org/eclipse/jetty/util/compression/InflaterPool.java
index 79dcb175126..7157d87ad9a 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/InflaterPool.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/InflaterPool.java
@@ -16,16 +16,13 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.util;
-
-import org.apache.commons.pool.ObjectPool;
+package org.eclipse.jetty.util.compression;
 
 import java.util.zip.Inflater;
 
-public class InflaterPool
+public class InflaterPool extends CompressionPool<Inflater>
 {
-
-    private final ObjectPool<Inflater> inflaterPool;
+    private final boolean nowrap;
 
     /**
      * Create a Pool of {@link Inflater} instances.
@@ -39,38 +36,25 @@ public class InflaterPool
      */
     public InflaterPool(int capacity, boolean nowrap)
     {
-        inflaterPool = (capacity <= 0)
-                ? CompressionPool.growingInflaterPool(nowrap)
-                : CompressionPool.limitedInflaterPool(capacity, nowrap);
+        super(capacity);
+        this.nowrap = nowrap;
     }
 
-    /**
-     * @return Inflater taken from the pool if it is not empty or a newly created Inflater
-     */
-    public Inflater acquire()
+    @Override
+    protected Inflater newObject()
     {
-        try
-        {
-            return inflaterPool.borrowObject();
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e);
-        }
+        return new Inflater(nowrap);
     }
 
-    /**
-     * @param inflater returns this Inflater to the pool or calls inflater.end() if the pool is full.
-     */
-    public void release(Inflater inflater)
+    @Override
+    protected void end(Inflater inflater)
     {
-        try
-        {
-            inflaterPool.returnObject(inflater);
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e);
-        }
+        inflater.end();
+    }
+
+    @Override
+    protected void reset(Inflater inflater)
+    {
+        inflater.reset();
     }
 }
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
index b0bd97b846d..797b4af306f 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
@@ -29,9 +29,9 @@ import java.util.zip.Inflater;
 import java.util.zip.ZipException;
 
 import org.eclipse.jetty.util.BufferUtil;
-import org.eclipse.jetty.util.DeflaterPool;
-import org.eclipse.jetty.util.InflaterPool;
 import org.eclipse.jetty.util.IteratingCallback;
+import org.eclipse.jetty.util.compression.DeflaterPool;
+import org.eclipse.jetty.util.compression.InflaterPool;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.websocket.api.BatchMode;
diff --git a/pom.xml b/pom.xml
index 45f06084457..822f5fce5ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1068,11 +1068,6 @@
         <artifactId>hamcrest-library</artifactId>
         <version>1.3</version>
       </dependency>
-      <dependency>
-        <groupId>commons-pool</groupId>
-        <artifactId>commons-pool</artifactId>
-        <version>1.6</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

From c30c335df3b2654dbca9e874a811d2d8452e5baf Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Fri, 14 Jun 2019 16:20:00 +1000
Subject: [PATCH 4/8] Issue #300 - shared Inflater/Deflater pools for WebSocket

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../util/compression/CompressionPool.java     |  4 +++-
 .../extensions/WebSocketExtensionFactory.java | 15 ++++++++++++++
 .../compress/CompressExtension.java           | 20 +++++++++++--------
 .../compress/DeflateFrameExtensionTest.java   | 17 ++++++++++++++++
 .../PerMessageDeflateExtensionTest.java       | 18 ++++++++++++++++-
 5 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
index d05fb86f692..f4108339c51 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
@@ -24,6 +24,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public abstract class CompressionPool<T>
 {
+    public static final int INFINITE_CAPACITY = -1;
+
     private final Queue<T> _pool;
     private final AtomicInteger _numObjects = new AtomicInteger(0);
     private final int _capacity;
@@ -77,7 +79,7 @@ public abstract class CompressionPool<T>
     }
 
     /**
-     * @param object returns this Object to the pool or calls {@link #end(T)} if the pool is full.
+     * @param object returns this Object to the pool or calls {@link #end(Object)} if the pool is full.
      */
     public void release(T object)
     {
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/WebSocketExtensionFactory.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/WebSocketExtensionFactory.java
index 03df0b398f7..cffeeea85fc 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/WebSocketExtensionFactory.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/WebSocketExtensionFactory.java
@@ -18,16 +18,24 @@
 
 package org.eclipse.jetty.websocket.common.extensions;
 
+import java.util.zip.Deflater;
+
 import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.compression.CompressionPool;
+import org.eclipse.jetty.util.compression.DeflaterPool;
+import org.eclipse.jetty.util.compression.InflaterPool;
 import org.eclipse.jetty.websocket.api.WebSocketException;
 import org.eclipse.jetty.websocket.api.extensions.Extension;
 import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
 import org.eclipse.jetty.websocket.api.extensions.ExtensionFactory;
+import org.eclipse.jetty.websocket.common.extensions.compress.CompressExtension;
 import org.eclipse.jetty.websocket.common.scopes.WebSocketContainerScope;
 
 public class WebSocketExtensionFactory extends ExtensionFactory
 {
     private WebSocketContainerScope container;
+    private final InflaterPool inflaterPool = new InflaterPool(CompressionPool.INFINITE_CAPACITY, true);
+    private final DeflaterPool deflaterPool = new DeflaterPool(CompressionPool.INFINITE_CAPACITY, Deflater.DEFAULT_COMPRESSION, true);
 
     public WebSocketExtensionFactory(WebSocketContainerScope container)
     {
@@ -64,6 +72,13 @@ public class WebSocketExtensionFactory extends ExtensionFactory
                 aext.init(container);
                 aext.setConfig(config);
             }
+            if (ext instanceof CompressExtension)
+            {
+                CompressExtension cext = (CompressExtension)ext;
+                cext.setInflaterPool(inflaterPool);
+                cext.setDeflaterPool(deflaterPool);
+            }
+
             return ext;
         }
         catch (Exception e)
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
index 797b4af306f..ecba8764d8b 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
@@ -71,16 +71,10 @@ public abstract class CompressExtension extends AbstractExtension
 
     /** Inflater : Output Buffer Size */
     private static final int DECOMPRESS_BUF_SIZE = 8 * 1024;
-    
-    private final static boolean NOWRAP = true;
-    private final static int POOL_CAPACITY = -1;
-
-    private static final DeflaterPool deflaterPool = new DeflaterPool(POOL_CAPACITY,
-            Deflater.DEFAULT_COMPRESSION, NOWRAP);
-    private static final InflaterPool inflaterPool = new InflaterPool(POOL_CAPACITY, NOWRAP);
-
     private final Queue<FrameEntry> entries = new ArrayDeque<>();
     private final IteratingCallback flusher = new Flusher();
+    private DeflaterPool deflaterPool;
+    private InflaterPool inflaterPool;
     private Deflater deflaterImpl;
     private Inflater inflaterImpl;
     protected AtomicInteger decompressCount = new AtomicInteger(0);
@@ -93,6 +87,16 @@ public abstract class CompressExtension extends AbstractExtension
         rsvUse = getRsvUseMode();
     }
 
+    public void setInflaterPool(InflaterPool inflaterPool)
+    {
+        this.inflaterPool = inflaterPool;
+    }
+
+    public void setDeflaterPool(DeflaterPool deflaterPool)
+    {
+        this.deflaterPool = deflaterPool;
+    }
+
     public Deflater getDeflater()
     {
         if (deflaterImpl == null)
diff --git a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
index a20e3a096b0..fb683d46bc1 100644
--- a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
+++ b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
@@ -34,6 +34,9 @@ import org.eclipse.jetty.io.RuntimeIOException;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.util.TypeUtil;
+import org.eclipse.jetty.util.compression.CompressionPool;
+import org.eclipse.jetty.util.compression.DeflaterPool;
+import org.eclipse.jetty.util.compression.InflaterPool;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.websocket.api.BatchMode;
@@ -68,6 +71,8 @@ public class DeflateFrameExtensionTest extends AbstractExtensionTest
     private static final Logger LOG = Log.getLogger(DeflateFrameExtensionTest.class);
 
     public ByteBufferPool bufferPool = new MappedByteBufferPool();
+    public DeflaterPool deflaterPool = new DeflaterPool(CompressionPool.INFINITE_CAPACITY, Deflater.DEFAULT_COMPRESSION, true);
+    public InflaterPool inflaterPool = new InflaterPool(CompressionPool.INFINITE_CAPACITY, true);
 
     private void assertIncoming(byte[] raw, String... expectedTextDatas)
     {
@@ -75,6 +80,8 @@ public class DeflateFrameExtensionTest extends AbstractExtensionTest
 
         DeflateFrameExtension ext = new DeflateFrameExtension();
         ext.setBufferPool(bufferPool);
+        ext.setDeflaterPool(deflaterPool);
+        ext.setInflaterPool(inflaterPool);
         ext.setPolicy(policy);
 
         ExtensionConfig config = ExtensionConfig.parse("deflate-frame");
@@ -119,6 +126,8 @@ public class DeflateFrameExtensionTest extends AbstractExtensionTest
 
         DeflateFrameExtension ext = new DeflateFrameExtension();
         ext.setBufferPool(bufferPool);
+        ext.setDeflaterPool(deflaterPool);
+        ext.setInflaterPool(inflaterPool);
         ext.setPolicy(policy);
 
         ExtensionConfig config = ExtensionConfig.parse("deflate-frame");
@@ -251,6 +260,8 @@ public class DeflateFrameExtensionTest extends AbstractExtensionTest
     {
         ext.setConfig(new ExtensionConfig(ext.getName()));
         ext.setBufferPool(bufferPool);
+        ext.setDeflaterPool(deflaterPool);
+        ext.setInflaterPool(inflaterPool);
     }
 
     @Test
@@ -303,6 +314,8 @@ public class DeflateFrameExtensionTest extends AbstractExtensionTest
 
         DeflateFrameExtension ext = new DeflateFrameExtension();
         ext.setBufferPool(bufferPool);
+        ext.setDeflaterPool(deflaterPool);
+        ext.setInflaterPool(inflaterPool);
         ext.setPolicy(policy);
         ext.setConfig(new ExtensionConfig(ext.getName()));
 
@@ -395,6 +408,8 @@ public class DeflateFrameExtensionTest extends AbstractExtensionTest
         
         DeflateFrameExtension clientExtension = new DeflateFrameExtension();
         clientExtension.setBufferPool(bufferPool);
+        clientExtension.setDeflaterPool(deflaterPool);
+        clientExtension.setInflaterPool(inflaterPool);
         clientExtension.setPolicy(WebSocketPolicy.newClientPolicy());
         clientExtension.getPolicy().setMaxBinaryMessageSize(maxMessageSize);
         clientExtension.getPolicy().setMaxBinaryMessageBufferSize(maxMessageSize);
@@ -402,6 +417,8 @@ public class DeflateFrameExtensionTest extends AbstractExtensionTest
 
         final DeflateFrameExtension serverExtension = new DeflateFrameExtension();
         serverExtension.setBufferPool(bufferPool);
+        serverExtension.setDeflaterPool(deflaterPool);
+        serverExtension.setInflaterPool(inflaterPool);
         serverExtension.setPolicy(WebSocketPolicy.newServerPolicy());
         serverExtension.getPolicy().setMaxBinaryMessageSize(maxMessageSize);
         serverExtension.getPolicy().setMaxBinaryMessageBufferSize(maxMessageSize);
diff --git a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
index f1c131db729..f67a6e8fb1d 100644
--- a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
+++ b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
@@ -24,12 +24,16 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.zip.Deflater;
 
 import org.eclipse.jetty.io.ByteBufferPool;
 import org.eclipse.jetty.io.MappedByteBufferPool;
 import org.eclipse.jetty.toolchain.test.ByteBufferAssert;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.TypeUtil;
+import org.eclipse.jetty.util.compression.CompressionPool;
+import org.eclipse.jetty.util.compression.DeflaterPool;
+import org.eclipse.jetty.util.compression.InflaterPool;
 import org.eclipse.jetty.websocket.api.BatchMode;
 import org.eclipse.jetty.websocket.api.ProtocolException;
 import org.eclipse.jetty.websocket.api.WebSocketPolicy;
@@ -58,7 +62,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 public class PerMessageDeflateExtensionTest extends AbstractExtensionTest
 {
     public ByteBufferPool bufferPool = new MappedByteBufferPool();
-    
+    public DeflaterPool deflaterPool = new DeflaterPool(CompressionPool.INFINITE_CAPACITY, Deflater.DEFAULT_COMPRESSION, true);
+    public InflaterPool inflaterPool = new InflaterPool(CompressionPool.INFINITE_CAPACITY, true);
+
     private void assertEndsWithTail(String hexStr, boolean expectedResult)
     {
         ByteBuffer buf = ByteBuffer.wrap(TypeUtil.fromHexString(hexStr));
@@ -284,6 +290,8 @@ public class PerMessageDeflateExtensionTest extends AbstractExtensionTest
     {
         PerMessageDeflateExtension ext = new PerMessageDeflateExtension();
         ext.setBufferPool(bufferPool);
+        ext.setDeflaterPool(deflaterPool);
+        ext.setInflaterPool(inflaterPool);
         ext.setPolicy(WebSocketPolicy.newServerPolicy());
         ExtensionConfig config = ExtensionConfig.parse("permessage-deflate");
         ext.setConfig(config);
@@ -321,6 +329,8 @@ public class PerMessageDeflateExtensionTest extends AbstractExtensionTest
     {
         PerMessageDeflateExtension ext = new PerMessageDeflateExtension();
         ext.setBufferPool(bufferPool);
+        ext.setDeflaterPool(deflaterPool);
+        ext.setInflaterPool(inflaterPool);
         ext.setPolicy(WebSocketPolicy.newServerPolicy());
         ExtensionConfig config = ExtensionConfig.parse("permessage-deflate");
         ext.setConfig(config);
@@ -359,6 +369,8 @@ public class PerMessageDeflateExtensionTest extends AbstractExtensionTest
     {
         PerMessageDeflateExtension ext = new PerMessageDeflateExtension();
         ext.setBufferPool(bufferPool);
+        ext.setDeflaterPool(deflaterPool);
+        ext.setInflaterPool(inflaterPool);
         ext.setPolicy(WebSocketPolicy.newServerPolicy());
         ExtensionConfig config = ExtensionConfig.parse("permessage-deflate");
         ext.setConfig(config);
@@ -415,6 +427,8 @@ public class PerMessageDeflateExtensionTest extends AbstractExtensionTest
     {
         PerMessageDeflateExtension ext = new PerMessageDeflateExtension();
         ext.setBufferPool(bufferPool);
+        ext.setDeflaterPool(deflaterPool);
+        ext.setInflaterPool(inflaterPool);
         ext.setPolicy(WebSocketPolicy.newServerPolicy());
         ExtensionConfig config = ExtensionConfig.parse("permessage-deflate");
         ext.setConfig(config);
@@ -455,6 +469,8 @@ public class PerMessageDeflateExtensionTest extends AbstractExtensionTest
     {
         PerMessageDeflateExtension ext = new PerMessageDeflateExtension();
         ext.setBufferPool(bufferPool);
+        ext.setDeflaterPool(deflaterPool);
+        ext.setInflaterPool(inflaterPool);
         ext.setPolicy(WebSocketPolicy.newServerPolicy());
         ExtensionConfig config = ExtensionConfig.parse("permessage-deflate");
         ext.setConfig(config);

From 30dc103a129d08304e1f1a99a84c045049de305d Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 18 Jun 2019 12:31:25 +1000
Subject: [PATCH 5/8] Issue #300 - manage deflater/inflater pools with
 ContainerLifeCycle

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../util/compression/CompressionPool.java     | 16 ++++-
 .../api/extensions/ExtensionFactory.java      | 58 +++--------------
 .../websocket/client/WebSocketClient.java     |  1 +
 .../extensions/WebSocketExtensionFactory.java | 62 ++++++++++++++++++-
 .../server/WebSocketServerFactory.java        |  1 +
 5 files changed, 85 insertions(+), 53 deletions(-)

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
index f4108339c51..6582f5d3a90 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
@@ -22,7 +22,9 @@ import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public abstract class CompressionPool<T>
+import org.eclipse.jetty.util.component.AbstractLifeCycle;
+
+public abstract class CompressionPool<T> extends AbstractLifeCycle
 {
     public static final int INFINITE_CAPACITY = -1;
 
@@ -117,4 +119,16 @@ public abstract class CompressionPool<T>
             }
         }
     }
+
+    @Override
+    public void doStop()
+    {
+        T t = _pool.poll();
+        while (t != null)
+        {
+            end(t);
+            t = _pool.poll();
+        }
+        _numObjects.set(0);
+    }
 }
\ No newline at end of file
diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java
index 80ca434db18..eae3dd3fbe6 100644
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java
@@ -18,64 +18,22 @@
 
 package org.eclipse.jetty.websocket.api.extensions;
 
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.ServiceLoader;
 import java.util.Set;
 
-public abstract class ExtensionFactory implements Iterable<Class<? extends Extension>>
+public interface ExtensionFactory extends Iterable<Class<? extends Extension>>
 {
-    private ServiceLoader<Extension> extensionLoader = ServiceLoader.load(Extension.class);
-    private Map<String, Class<? extends Extension>> availableExtensions;
+    Map<String, Class<? extends Extension>> getAvailableExtensions();
 
-    public ExtensionFactory()
-    {
-        availableExtensions = new HashMap<>();
-        for (Extension ext : extensionLoader)
-        {
-            if (ext != null)
-            {
-                availableExtensions.put(ext.getName(),ext.getClass());
-            }
-        }
-    }
+    Class<? extends Extension> getExtension(String name);
 
-    public Map<String, Class<? extends Extension>> getAvailableExtensions()
-    {
-        return availableExtensions;
-    }
+    Set<String> getExtensionNames();
 
-    public Class<? extends Extension> getExtension(String name)
-    {
-        return availableExtensions.get(name);
-    }
+    boolean isAvailable(String name);
 
-    public Set<String> getExtensionNames()
-    {
-        return availableExtensions.keySet();
-    }
+    Extension newInstance(ExtensionConfig config);
 
-    public boolean isAvailable(String name)
-    {
-        return availableExtensions.containsKey(name);
-    }
+    void register(String name, Class<? extends Extension> extension);
 
-    @Override
-    public Iterator<Class<? extends Extension>> iterator()
-    {
-        return availableExtensions.values().iterator();
-    }
-
-    public abstract Extension newInstance(ExtensionConfig config);
-
-    public void register(String name, Class<? extends Extension> extension)
-    {
-        availableExtensions.put(name,extension);
-    }
-
-    public void unregister(String name)
-    {
-        availableExtensions.remove(name);
-    }
+    void unregister(String name);
 }
diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
index 071079e9050..1e025c53ac2 100644
--- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
+++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
@@ -274,6 +274,7 @@ public class WebSocketClient extends ContainerLifeCycle implements WebSocketCont
         // Support Late Binding of Object Factory (for CDI)
         this.objectFactorySupplier = () -> scope.getObjectFactory();
         this.extensionRegistry = new WebSocketExtensionFactory(this);
+        addBean(extensionRegistry);
 
         this.eventDriverFactory = eventDriverFactory == null ? new EventDriverFactory(this) : eventDriverFactory;
         this.sessionFactory = sessionFactory == null ? new WebSocketSessionFactory(this) : sessionFactory;
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/WebSocketExtensionFactory.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/WebSocketExtensionFactory.java
index cffeeea85fc..43a1355b5ec 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/WebSocketExtensionFactory.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/WebSocketExtensionFactory.java
@@ -18,9 +18,15 @@
 
 package org.eclipse.jetty.websocket.common.extensions;
 
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.Set;
 import java.util.zip.Deflater;
 
 import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.component.ContainerLifeCycle;
 import org.eclipse.jetty.util.compression.CompressionPool;
 import org.eclipse.jetty.util.compression.DeflaterPool;
 import org.eclipse.jetty.util.compression.InflaterPool;
@@ -31,16 +37,50 @@ import org.eclipse.jetty.websocket.api.extensions.ExtensionFactory;
 import org.eclipse.jetty.websocket.common.extensions.compress.CompressExtension;
 import org.eclipse.jetty.websocket.common.scopes.WebSocketContainerScope;
 
-public class WebSocketExtensionFactory extends ExtensionFactory
+public class WebSocketExtensionFactory extends ContainerLifeCycle implements ExtensionFactory
 {
     private WebSocketContainerScope container;
+    private ServiceLoader<Extension> extensionLoader = ServiceLoader.load(Extension.class);
+    private Map<String, Class<? extends Extension>> availableExtensions;
     private final InflaterPool inflaterPool = new InflaterPool(CompressionPool.INFINITE_CAPACITY, true);
     private final DeflaterPool deflaterPool = new DeflaterPool(CompressionPool.INFINITE_CAPACITY, Deflater.DEFAULT_COMPRESSION, true);
 
     public WebSocketExtensionFactory(WebSocketContainerScope container)
     {
-        super();
+        availableExtensions = new HashMap<>();
+        for (Extension ext : extensionLoader)
+        {
+            if (ext != null)
+                availableExtensions.put(ext.getName(),ext.getClass());
+        }
+
         this.container = container;
+        addBean(inflaterPool);
+        addBean(deflaterPool);
+    }
+
+    @Override
+    public Map<String, Class<? extends Extension>> getAvailableExtensions()
+    {
+        return availableExtensions;
+    }
+
+    @Override
+    public Class<? extends Extension> getExtension(String name)
+    {
+        return availableExtensions.get(name);
+    }
+
+    @Override
+    public Set<String> getExtensionNames()
+    {
+        return availableExtensions.keySet();
+    }
+
+    @Override
+    public boolean isAvailable(String name)
+    {
+        return availableExtensions.containsKey(name);
     }
 
     @Override
@@ -86,4 +126,22 @@ public class WebSocketExtensionFactory extends ExtensionFactory
             throw new WebSocketException("Cannot instantiate extension: " + extClass,e);
         }
     }
+
+    @Override
+    public void register(String name, Class<? extends Extension> extension)
+    {
+        availableExtensions.put(name,extension);
+    }
+
+    @Override
+    public void unregister(String name)
+    {
+        availableExtensions.remove(name);
+    }
+
+    @Override
+    public Iterator<Class<? extends Extension>> iterator()
+    {
+        return availableExtensions.values().iterator();
+    }
 }
diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
index ee86aec9edd..4755b5c3306 100644
--- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
+++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
@@ -186,6 +186,7 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc
         addBean(scheduler);
         addBean(bufferPool);
         addBean(sessionTracker);
+        addBean(extensionFactory);
         listeners.add(this.sessionTracker);
     }
 

From e67532372c25717ee58343f272f17ef0b40afc25 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 20 Jun 2019 09:09:20 +1000
Subject: [PATCH 6/8] Issue #300 - ensure Sessions are stopped before
 CompressionPools

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../eclipse/jetty/util/compression/CompressionPool.java   | 2 +-
 .../eclipse/jetty/websocket/client/WebSocketClient.java   | 2 ++
 .../jetty/websocket/server/WebSocketServerFactory.java    | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
index 6582f5d3a90..35f67dbe816 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
@@ -88,7 +88,7 @@ public abstract class CompressionPool<T> extends AbstractLifeCycle
         if (object == null)
             return;
 
-        if (_capacity == 0)
+        if (_capacity == 0 || isStopped())
         {
             end(object);
             return;
diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
index 1e025c53ac2..3fd91049aaa 100644
--- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
+++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
@@ -400,6 +400,8 @@ public class WebSocketClient extends ContainerLifeCycle implements WebSocketCont
 
         ShutdownThread.deregister(this);
 
+        sessionTracker.stop();
+        extensionRegistry.stop();
         super.doStop();
 
         if (LOG.isDebugEnabled())
diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
index 4755b5c3306..022811a6c2a 100644
--- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
+++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
@@ -338,6 +338,14 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc
         super.doStart();
     }
 
+    @Override
+    protected void doStop() throws Exception
+    {
+        sessionTracker.stop();
+        extensionFactory.stop();
+        super.doStop();
+    }
+
     /**
      * Attempt to find the DecoratedObjectFactory that should be used.
      * @return the DecoratedObjectFactory that should be used. (never null)

From 325a0844227cddd2694f1aedf3020d0d0f4946ff Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Wed, 3 Jul 2019 11:51:05 +1000
Subject: [PATCH 7/8] Issue #300 - improvements to CompressionPool

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../jetty/util/compression/CompressionPool.java        | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
index a2298425b93..042ca327607 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/compression/CompressionPool.java
@@ -62,18 +62,12 @@ public abstract class CompressionPool<T> extends AbstractLifeCycle
 
         if (_capacity == 0)
             object = newObject();
-        else if (_capacity < 0)
-        {
-            object = _pool.poll();
-            if (object == null)
-                object = newObject();
-        }
         else
         {
             object = _pool.poll();
             if (object == null)
                 object = newObject();
-            else
+            else if (_capacity > 0)
                 _numObjects.decrementAndGet();
         }
 
@@ -88,7 +82,7 @@ public abstract class CompressionPool<T> extends AbstractLifeCycle
         if (object == null)
             return;
 
-        if (_capacity == 0 || isStopped())
+        if (_capacity == 0 || !isRunning())
         {
             end(object);
             return;

From d69bf3149474499614a5ab7e458b1215da58f4d4 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 4 Jul 2019 11:10:24 +1000
Subject: [PATCH 8/8] Issue #300 - fix test expectation after CompressExtension
 changes

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../org/eclipse/jetty/websocket/tests/WriteAfterStopTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WriteAfterStopTest.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WriteAfterStopTest.java
index 211efcddfa5..6aca5cbe627 100644
--- a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WriteAfterStopTest.java
+++ b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WriteAfterStopTest.java
@@ -19,6 +19,7 @@
 package org.eclipse.jetty.websocket.tests;
 
 import java.net.URI;
+import java.nio.channels.ClosedChannelException;
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jetty.server.Server;
@@ -108,7 +109,7 @@ public class WriteAfterStopTest
 
         try (StacklessLogging stacklessLogging = new StacklessLogging(CompressExtension.class))
         {
-            assertThrows(NullPointerException.class,
+            assertThrows(ClosedChannelException.class,
                 () -> session.getRemote().sendString("hello world"));
         }
     }