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-07-03 15:03:54 +02:00
parent 78e42130e7 6c0100181e
commit 9da52222fd
1 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java
View File

@ -279,36 +279,44 @@ public class ServerConnector extends AbstractNetworkConnector
{ {
if (_acceptChannel == null) if (_acceptChannel == null)
{ {
ServerSocketChannel serverChannel = null; _acceptChannel = openAcceptChannel();
if (isInheritChannel()) _acceptChannel.configureBlocking(true);
{ _localPort = _acceptChannel.socket().getLocalPort();
Channel channel = System.inheritedChannel(); if (_localPort <= 0)
if (channel instanceof ServerSocketChannel) throw new IOException("Server channel not bound");
serverChannel = (ServerSocketChannel)channel; addBean(_acceptChannel);
else
LOG.warn("Unable to use System.inheritedChannel() [{}]. Trying a new ServerSocketChannel at {}:{}", channel, getHost(), getPort());
}
if (serverChannel == null)
{
serverChannel = ServerSocketChannel.open();
InetSocketAddress bindAddress = getHost() == null ? new InetSocketAddress(getPort()) : new InetSocketAddress(getHost(), getPort());
serverChannel.socket().setReuseAddress(getReuseAddress());
serverChannel.socket().bind(bindAddress, getAcceptQueueSize());
_localPort = serverChannel.socket().getLocalPort();
if (_localPort <= 0)
throw new IOException("Server channel not bound");
}
serverChannel.configureBlocking(true);
addBean(serverChannel);
_acceptChannel = serverChannel;
} }
} }
/**
* Called by {@link #open()} to obtain the accepting channel.
* @return ServerSocketChannel used to accept connections.
* @throws IOException
*/
protected ServerSocketChannel openAcceptChannel() throws IOException
{
ServerSocketChannel serverChannel = null;
if (isInheritChannel())
{
Channel channel = System.inheritedChannel();
if (channel instanceof ServerSocketChannel)
serverChannel = (ServerSocketChannel)channel;
else
LOG.warn("Unable to use System.inheritedChannel() [{}]. Trying a new ServerSocketChannel at {}:{}", channel, getHost(), getPort());
}
if (serverChannel == null)
{
serverChannel = ServerSocketChannel.open();
InetSocketAddress bindAddress = getHost() == null ? new InetSocketAddress(getPort()) : new InetSocketAddress(getHost(), getPort());
serverChannel.socket().setReuseAddress(getReuseAddress());
serverChannel.socket().bind(bindAddress, getAcceptQueueSize());
}
return serverChannel;
}
@Override @Override
public Future<Void> shutdown() public Future<Void> shutdown()
{ {