Merge branch '3.2.x'

Closes gh-39080
spring-projects · Jan 10, 2024 · 5650a54 · 5650a54
2 parents d610955 + 47564cc
commit 5650a54
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/...c/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java b/...c/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java
@@ -116,6 +116,7 @@
  * @author Venil Noronha
  * @author Henri Kerola
  * @author Moritz Halbritter
+ * @author Onur Kagan Ozcan
  * @since 2.0.0
  * @see #setPort(int)
  * @see #setConfigurations(Collection)
@@ -183,7 +184,7 @@ public WebServer getWebServer(ServletContextInitializer... initializers) {
 		server.setHandler(addHandlerWrappers(context));
 		this.logger.info("Server initialized with port: " + port);
 		if (this.maxConnections > -1) {
-			server.addBean(new ConnectionLimit(this.maxConnections, server));
+			server.addBean(new ConnectionLimit(this.maxConnections, server.getConnectors()));
 		}
 		if (Ssl.isEnabled(getSsl())) {
 			customizeSsl(server, address);

diff --git a/...t/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java b/...t/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java
@@ -39,13 +39,15 @@
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.jasper.servlet.JspServlet;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.awaitility.Awaitility;
 import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler;
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.ee10.webapp.AbstractConfiguration;
 import org.eclipse.jetty.ee10.webapp.ClassMatcher;
 import org.eclipse.jetty.ee10.webapp.Configuration;
 import org.eclipse.jetty.ee10.webapp.WebAppContext;
+import org.eclipse.jetty.server.AbstractConnector;
 import org.eclipse.jetty.server.ConnectionLimit;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
@@ -85,6 +87,7 @@
  * @author Andy Wilkinson
  * @author Henri Kerola
  * @author Moritz Halbritter
+ * @author Onur Kagan Ozcan
  */
 class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryTests {
 
@@ -541,6 +544,19 @@ void shouldApplyMaxConnections() {
 		assertThat(connectionLimit.getMaxConnections()).isOne();
 	}
 
+	@Test
+	void shouldApplyingMaxConnectionUseConnector() throws Exception {
+		JettyServletWebServerFactory factory = getFactory();
+		factory.setMaxConnections(1);
+		this.webServer = factory.getWebServer();
+		Server server = ((JettyWebServer) this.webServer).getServer();
+		assertThat(server.getConnectors()).isEmpty();
+		ConnectionLimit connectionLimit = server.getBean(ConnectionLimit.class);
+		assertThat(connectionLimit).extracting("_connectors")
+			.asInstanceOf(InstanceOfAssertFactories.list(AbstractConnector.class))
+			.hasSize(1);
+	}
+
 	@Override
 	protected String startedLogMessage() {
 		return ((JettyWebServer) this.webServer).getStartedLogMessage();