Skip to content

Commit c3bf854

Browse files
committed
Do not rely on findAvailableTcpPort finding an available port
Closes gh-12779
1 parent c0af866 commit c3bf854

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,10 @@ private List<Port> getConfiguredPorts() {
266266
List<Port> ports = new ArrayList<>();
267267
for (Object listener : extractListeners()) {
268268
try {
269-
ports.add(getPortFromListener(listener));
269+
Port port = getPortFromListener(listener);
270+
if (port.getNumber() != 0) {
271+
ports.add(port);
272+
}
270273
}
271274
catch (Exception ex) {
272275
// Continue

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,6 @@ public void portClashOfSecondaryConnectorResultsInPortInUseException()
933933
doWithBlockedPort((port) -> {
934934
try {
935935
AbstractServletWebServerFactory factory = getFactory();
936-
factory.setPort(SocketUtils.findAvailableTcpPort(40000));
937936
addConnector(port, factory);
938937
AbstractServletWebServerFactoryTests.this.webServer = factory
939938
.getWebServer();

0 commit comments

Comments
 (0)