Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore Jetty 8 compatibility

Browse Source 
Acceptors and Selectors aren't supported with Jetty 8.

See gh-5380
This commit is contained in:
Phillip Webb 2016-04-11 12:17:43 -07:00
parent c79ecc29c6
commit fa142d929a
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-samples/spring-boot-sample-jetty/src/main/resources/application.properties
View File

@ -1,2 +1,3 @@
server.compression.enabled: true
server.compression.min-response-size: 1
server.compression.min-response-size: 1
server.jetty.acceptors=2

3
spring-boot-samples/spring-boot-sample-jetty8/src/main/resources/application.properties
View File

@ -1,2 +1,3 @@
server.compression.enabled: true
server.compression.min-response-size: 1
server.compression.min-response-size: 1
server.jetty.acceptors=2

21
spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View File

@ -154,7 +154,8 @@ public class JettyEmbeddedServletContainerFactory
ServletContextInitializer... initializers) {
JettyEmbeddedWebAppContext context = new JettyEmbeddedWebAppContext();
int port = (getPort() >= 0 ? getPort() : 0);
Server server = createServer(port);
InetSocketAddress address = new InetSocketAddress(getAddress(), port);
Server server = createServer(address);
configureWebAppContext(context, initializers);
server.setHandler(addHandlerWrappers(context));
this.logger.info("Server initialized with port: " + port);
@ -174,19 +175,21 @@ public class JettyEmbeddedServletContainerFactory
return getJettyEmbeddedServletContainer(server);
}
private Server createServer(int port) {
private Server createServer(InetSocketAddress address) {
if (this.acceptors < 0 && this.selectors < 0) {
return new Server(address);
}
if (!ClassUtils.isPresent("org.eclipse.jetty.server.ServerConnector", null)) {
this.logger.warn("Acceptors and Selectors are not supported with Jetty 8");
return new Server(address);
}
Server server = new Server();
server.setConnectors(new Connector[] { createConnector(port, server) });
return server;
}
private ServerConnector createConnector(int port, Server server) {
ServerConnector connector = new ServerConnector(server, this.acceptors,
this.selectors);
InetSocketAddress address = new InetSocketAddress(getAddress(), port);
connector.setHost(address.getHostName());
connector.setPort(address.getPort());
return connector;
server.setConnectors(new Connector[] { connector });
return server;
}
private Handler addHandlerWrappers(Handler handler) {