Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Greg Wilkins 2017-03-30 13:47:47 +11:00
parent be1ddf61df 9496cef9b2
commit 1a0b2dfdb5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnection.java
View File

@ -241,7 +241,7 @@ public class HTTP2ServerConnection extends HTTP2Connection implements Connection
{ {
HttpTransportOverHTTP2 transport = new HttpTransportOverHTTP2(connector, this); HttpTransportOverHTTP2 transport = new HttpTransportOverHTTP2(connector, this);
transport.setStream(stream); transport.setStream(stream);
channel = new ServerHttpChannelOverHTTP2(connector, httpConfig, getEndPoint(), transport); channel = newServerHttpChannelOverHTTP2(connector, httpConfig, transport);
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Creating channel {} for {}", channel, this); LOG.debug("Creating channel {} for {}", channel, this);
} }
@ -249,6 +249,11 @@ public class HTTP2ServerConnection extends HTTP2Connection implements Connection
return channel; return channel;
} }
protected ServerHttpChannelOverHTTP2 newServerHttpChannelOverHTTP2(Connector connector, HttpConfiguration httpConfig, HttpTransportOverHTTP2 transport)
{
return new ServerHttpChannelOverHTTP2(connector, httpConfig, getEndPoint(), transport);
}
private void offerChannel(HttpChannelOverHTTP2 channel) private void offerChannel(HttpChannelOverHTTP2 channel)
{ {
synchronized (this) synchronized (this)
@ -299,7 +304,7 @@ public class HTTP2ServerConnection extends HTTP2Connection implements Connection
return true; 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) public ServerHttpChannelOverHTTP2(Connector connector, HttpConfiguration configuration, EndPoint endPoint, HttpTransportOverHTTP2 transport)
{ {