Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

jetty · Mar 30, 2017 · 1a0b2df · 1a0b2df
2 parents be1ddf6 + 9496cef
commit 1a0b2df
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...ttp2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnection.java b/...ttp2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnection.java
@@ -241,14 +241,19 @@ private HttpChannelOverHTTP2 provideHttpChannel(Connector connector, IStream str
         {
             HttpTransportOverHTTP2 transport = new HttpTransportOverHTTP2(connector, this);
             transport.setStream(stream);
-            channel = new ServerHttpChannelOverHTTP2(connector, httpConfig, getEndPoint(), transport);
+            channel = newServerHttpChannelOverHTTP2(connector, httpConfig, transport);
             if (LOG.isDebugEnabled())
                 LOG.debug("Creating channel {} for {}", channel, this);
         }
         stream.setAttribute(IStream.CHANNEL_ATTRIBUTE, channel);
         return channel;
     }
 
+    protected ServerHttpChannelOverHTTP2 newServerHttpChannelOverHTTP2(Connector connector, HttpConfiguration httpConfig, HttpTransportOverHTTP2 transport)
+    {
+        return new ServerHttpChannelOverHTTP2(connector, httpConfig, getEndPoint(), transport);
+    }
+
     private void offerChannel(HttpChannelOverHTTP2 channel)
     {
         synchronized (this)
@@ -299,7 +304,7 @@ public boolean upgrade(Request request)
         return true;
     }
 
-    private class ServerHttpChannelOverHTTP2 extends HttpChannelOverHTTP2 implements Closeable
+    protected class ServerHttpChannelOverHTTP2 extends HttpChannelOverHTTP2 implements Closeable
     {
         public ServerHttpChannelOverHTTP2(Connector connector, HttpConfiguration configuration, EndPoint endPoint, HttpTransportOverHTTP2 transport)
         {