root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.3.x' into 3.4.x 

Closes gh-44294
This commit is contained in:
Stéphane Nicoll 2025-02-17 10:53:48 +01:00
parent 04a23e91d1 6f05926643
commit 40eefd5cae
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2022 the original author or authors. * Copyright 2012-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -66,9 +66,10 @@ public class ReactiveWebServerApplicationContext extends GenericReactiveWebAppli
super.refresh(); super.refresh();
} }
catch (RuntimeException ex) { catch (RuntimeException ex) {
WebServerManager serverManager = this.serverManager; WebServer webServer = getWebServer();
if (serverManager != null) { if (webServer != null) {
serverManager.getWebServer().stop(); webServer.stop();
webServer.destroy();
} }
throw ex; throw ex;
} }
@ -147,6 +148,10 @@ public class ReactiveWebServerApplicationContext extends GenericReactiveWebAppli
AvailabilityChangeEvent.publish(this, ReadinessState.REFUSING_TRAFFIC); AvailabilityChangeEvent.publish(this, ReadinessState.REFUSING_TRAFFIC);
} }
super.doClose(); super.doClose();
WebServer webServer = getWebServer();
if (webServer != null) {
webServer.destroy();
}
} }
/** /**

20
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContextTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2024 the original author or authors. * Copyright 2012-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -30,6 +30,7 @@ import org.springframework.boot.availability.AvailabilityChangeEvent;
import org.springframework.boot.availability.ReadinessState; import org.springframework.boot.availability.ReadinessState;
import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer; import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer;
import org.springframework.boot.web.reactive.server.MockReactiveWebServerFactory; import org.springframework.boot.web.reactive.server.MockReactiveWebServerFactory;
import org.springframework.boot.web.server.WebServer;
import org.springframework.context.ApplicationContextException; import org.springframework.context.ApplicationContextException;
import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
@ -42,6 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.mockito.BDDMockito.then; import static org.mockito.BDDMockito.then;
import static org.mockito.Mockito.times;
/** /**
* Tests for {@link ReactiveWebServerApplicationContext}. * Tests for {@link ReactiveWebServerApplicationContext}.
@ -121,13 +123,25 @@ class ReactiveWebServerApplicationContextTests {
} }
@Test @Test
void whenContextIsClosedThenWebServerIsStopped() { void whenContextRefreshFailedThenWebServerIsStoppedAndDestroyed() {
addWebServerFactoryBean();
addHttpHandlerBean();
this.context.registerBeanDefinition("refreshFailure", new RootBeanDefinition(RefreshFailure.class));
assertThatExceptionOfType(BeanCreationException.class).isThrownBy(this.context::refresh);
WebServer webServer = this.context.getWebServer();
then(webServer).should(times(2)).stop();
then(webServer).should().destroy();
}
@Test
void whenContextIsClosedThenWebServerIsStoppedAndDestroyed() {
addWebServerFactoryBean(); addWebServerFactoryBean();
addHttpHandlerBean(); addHttpHandlerBean();
this.context.refresh(); this.context.refresh();
MockReactiveWebServerFactory factory = this.context.getBean(MockReactiveWebServerFactory.class); MockReactiveWebServerFactory factory = this.context.getBean(MockReactiveWebServerFactory.class);
this.context.close(); this.context.close();
then(factory.getWebServer()).should().stop(); then(factory.getWebServer()).should(times(2)).stop();
then(factory.getWebServer()).should().destroy();
} }
@Test @Test