spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-25 19:09:03 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Merge branch '3.5.x'"

Browse Source 
This reverts commit 001f953cc9, reversing
changes made to 0ae86935ae.

See gh-48059
This commit is contained in:
Andy Wilkinson
2025-11-11 16:38:33 +00:00
parent 001f953cc9 c7c0d33b86
commit 93a3511f8a
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/NettyWebServer.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class NettyWebServer implements WebServer {
catch (Exception ex) {
PortInUseException.ifCausedBy(ex, ChannelBindException.class, (bindException) -> {
if (bindException.localPort() > 0 && !isPermissionDenied(bindException.getCause())) {
PortInUseException.throwIfPortBindingException(bindException, bindException::localPort);
throw new PortInUseException(bindException.localPort(), ex);
}
});
throw new WebServerException("Unable to start Netty", ex);
module/spring-boot-reactor-netty/src/test/java/org/springframework/boot/reactor/netty/NettyReactiveWebServerFactoryTests.java
+1 -12
View File
@@ -17,9 +17,7 @@
package org.springframework.boot.reactor.netty;
import java.net.ConnectException;
import java.net.InetAddress;
import java.net.SocketAddress;
import java.net.UnknownHostException;
import java.time.Duration;
import java.util.Arrays;
@@ -46,7 +44,6 @@ import org.springframework.boot.testsupport.classpath.resources.WithPackageResou
import org.springframework.boot.web.server.PortInUseException;
import org.springframework.boot.web.server.Shutdown;
import org.springframework.boot.web.server.Ssl;
import org.springframework.boot.web.server.WebServerException;
import org.springframework.boot.web.server.reactive.AbstractReactiveWebServerFactory;
import org.springframework.boot.web.server.reactive.AbstractReactiveWebServerFactoryTests;
import org.springframework.boot.web.server.reactive.ConfigurableReactiveWebServerFactory;
@@ -75,7 +72,7 @@ import static org.mockito.Mockito.mock;
class NettyReactiveWebServerFactoryTests extends AbstractReactiveWebServerFactoryTests {
@Test
void portInUseExceptionIsThrownWhenPortIsAlreadyInUse() {
void exceptionIsThrownWhenPortIsAlreadyInUse() {
AbstractReactiveWebServerFactory factory = getFactory();
factory.setPort(0);
this.webServer = factory.getWebServer(new EchoHandler());
@@ -86,14 +83,6 @@ class NettyReactiveWebServerFactoryTests extends AbstractReactiveWebServerFactor
.withCauseInstanceOf(Throwable.class);
}
@Test
void webServerExceptionIsThrownWhenAddressCannotBeAssigned() throws UnknownHostException {
AbstractReactiveWebServerFactory factory = getFactory();
factory.setPort(8080);
factory.setAddress(InetAddress.getByName("1.2.3.4"));
assertThatExceptionOfType(WebServerException.class).isThrownBy(factory.getWebServer(new EchoHandler())::start);
}
@Test
void getPortWhenDisposableServerPortOperationIsUnsupportedReturnsMinusOne() {
NettyReactiveWebServerFactory factory = new NoPortNettyReactiveWebServerFactory(0);