Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not rely on findAvailableTcpPort finding an available port

Browse Source 
Closes gh-12779
This commit is contained in:
Andy Wilkinson
2018-04-05 11:22:35 +01:00
parent c0af8666c3
commit c3bf8541d7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,7 +266,10 @@ public class UndertowServletWebServer implements WebServer {
List<Port> ports = new ArrayList<>();
for (Object listener : extractListeners()) {
try {
ports.add(getPortFromListener(listener));
Port port = getPortFromListener(listener);
if (port.getNumber() != 0) {
ports.add(port);
}
}
catch (Exception ex) {
// Continue

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

@@ -933,7 +933,6 @@ public abstract class AbstractServletWebServerFactoryTests {
doWithBlockedPort((port) -> {
try {
AbstractServletWebServerFactory factory = getFactory();
factory.setPort(SocketUtils.findAvailableTcpPort(40000));
addConnector(port, factory);
AbstractServletWebServerFactoryTests.this.webServer = factory
.getWebServer();