Skip to content

Commit 7113c10

Browse files
okohubmhalbritter
authored andcommitted
Fix Jetty ConnectionLimit configuration
See gh-39052
1 parent 793801b commit 7113c10

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
* @author Venil Noronha
117117
* @author Henri Kerola
118118
* @author Moritz Halbritter
119+
* @author Onur Kagan Ozcan
119120
* @since 2.0.0
120121
* @see #setPort(int)
121122
* @see #setConfigurations(Collection)
@@ -183,7 +184,7 @@ public WebServer getWebServer(ServletContextInitializer... initializers) {
183184
server.setHandler(addHandlerWrappers(context));
184185
this.logger.info("Server initialized with port: " + port);
185186
if (this.maxConnections > -1) {
186-
server.addBean(new ConnectionLimit(this.maxConnections, server));
187+
server.addBean(new ConnectionLimit(this.maxConnections, server.getConnectors()));
187188
}
188189
if (Ssl.isEnabled(getSsl())) {
189190
customizeSsl(server, address);

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272

7373
import static org.assertj.core.api.Assertions.assertThat;
7474
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
75+
import static org.assertj.core.api.InstanceOfAssertFactories.LIST;
7576
import static org.mockito.ArgumentMatchers.any;
7677
import static org.mockito.BDDMockito.given;
7778
import static org.mockito.Mockito.inOrder;
@@ -85,6 +86,7 @@
8586
* @author Andy Wilkinson
8687
* @author Henri Kerola
8788
* @author Moritz Halbritter
89+
* @author Onur Kagan Ozcan
8890
*/
8991
class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryTests {
9092

@@ -541,6 +543,17 @@ void shouldApplyMaxConnections() {
541543
assertThat(connectionLimit.getMaxConnections()).isOne();
542544
}
543545

546+
@Test
547+
void shouldApplyingMaxConnectionUseConnector() throws Exception {
548+
JettyServletWebServerFactory factory = getFactory();
549+
factory.setMaxConnections(1);
550+
this.webServer = factory.getWebServer();
551+
Server server = ((JettyWebServer) this.webServer).getServer();
552+
assertThat(server.getConnectors()).isEmpty();
553+
ConnectionLimit connectionLimit = server.getBean(ConnectionLimit.class);
554+
assertThat(connectionLimit).extracting("_connectors", LIST).hasSize(1);
555+
}
556+
544557
@Override
545558
protected String startedLogMessage() {
546559
return ((JettyWebServer) this.webServer).getStartedLogMessage();

0 commit comments

Comments
 (0)