From 1a2bb904656ed2a28359d44cd1abab0420a2f9cf Mon Sep 17 00:00:00 2001
From: Carter Kozak <c4kofony@gmail.com>
Date: Sun, 5 Feb 2017 11:28:26 -0500
Subject: [PATCH] Issue #1309 Client GZIPContentDecoder uses client
 ByteBufferPool

Previously the GZIPContentDecoder would allocate a new buffer for
each gzip encoded response.

Signed-off-by: Carter Kozak <c4kofony@gmail.com>
---
 .../jetty/client/GZIPContentDecoder.java      | 28 ++++++++++++++++---
 .../org/eclipse/jetty/client/HttpClient.java  |  2 +-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java b/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java
index 3ccfde883e1..a3d033a7dfd 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java
@@ -18,6 +18,7 @@
 
 package org.eclipse.jetty.client;
 
+import org.eclipse.jetty.io.ByteBufferPool;
 
 /**
  * {@link ContentDecoder} for the "gzip" encoding.
@@ -26,14 +27,21 @@ package org.eclipse.jetty.client;
 public class GZIPContentDecoder extends org.eclipse.jetty.http.GZIPContentDecoder implements ContentDecoder
 {
 
+    private static final int DEFAULT_BUFFER_SIZE = 2048;
+
     public GZIPContentDecoder()
     {
-        this(2048);
+        this(DEFAULT_BUFFER_SIZE);
     }
 
     public GZIPContentDecoder(int bufferSize)
     {
-        super(null,bufferSize);
+        this(null,bufferSize);
+    }
+
+    public GZIPContentDecoder(ByteBufferPool byteBufferPool, int bufferSize)
+    {
+        super(byteBufferPool, bufferSize);
     }
 
     /**
@@ -42,22 +50,34 @@ public class GZIPContentDecoder extends org.eclipse.jetty.http.GZIPContentDecode
     public static class Factory extends ContentDecoder.Factory
     {
         private final int bufferSize;
+        private final ByteBufferPool byteBufferPool;
 
         public Factory()
         {
-            this(2048);
+            this(DEFAULT_BUFFER_SIZE);
         }
 
         public Factory(int bufferSize)
+        {
+            this(null, bufferSize);
+        }
+
+        public Factory(ByteBufferPool byteBufferPool)
+        {
+            this(byteBufferPool, DEFAULT_BUFFER_SIZE);
+        }
+
+        public Factory(ByteBufferPool byteBufferPool, int bufferSize)
         {
             super("gzip");
+            this.byteBufferPool = byteBufferPool;
             this.bufferSize = bufferSize;
         }
 
         @Override
         public ContentDecoder newContentDecoder()
         {
-            return new GZIPContentDecoder(bufferSize);
+            return new GZIPContentDecoder(byteBufferPool, bufferSize);
         }
     }
 }
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
index 4dd571cf871..554b467d720 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
@@ -224,7 +224,7 @@ public class HttpClient extends ContainerLifeCycle
         handlers.put(new WWWAuthenticationProtocolHandler(this));
         handlers.put(new ProxyAuthenticationProtocolHandler(this));
 
-        decoderFactories.add(new GZIPContentDecoder.Factory());
+        decoderFactories.add(new GZIPContentDecoder.Factory(byteBufferPool));
 
         cookieManager = newCookieManager();
         cookieStore = cookieManager.getCookieStore();