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

Ensure shutdown hook is registered when a handler is added 

Closes gh-34627
This commit is contained in:
Andy Wilkinson 2023-04-18 18:19:07 +01:00
parent 3dac258aa8
commit 28b7c583a9
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationShutdownHook.java
View File

@ -170,6 +170,7 @@ class SpringApplicationShutdownHook implements Runnable {
@Override @Override
public void add(Runnable action) { public void add(Runnable action) {
Assert.notNull(action, "Action must not be null"); Assert.notNull(action, "Action must not be null");
addRuntimeShutdownHookIfNecessary();
synchronized (SpringApplicationShutdownHook.class) { synchronized (SpringApplicationShutdownHook.class) {
assertNotInProgress(); assertNotInProgress();
this.actions.add(action); this.actions.add(action);

9
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationShutdownHookTests.java
View File

@ -57,6 +57,15 @@ class SpringApplicationShutdownHookTests {
assertThat(shutdownHook.isRuntimeShutdownHookAdded()).isTrue(); assertThat(shutdownHook.isRuntimeShutdownHookAdded()).isTrue();
} }
@Test
void shutdownHookIsNotAddedUntilHandlerIsRegistered() {
TestSpringApplicationShutdownHook shutdownHook = new TestSpringApplicationShutdownHook();
assertThat(shutdownHook.isRuntimeShutdownHookAdded()).isFalse();
shutdownHook.getHandlers().add(() -> {
});
assertThat(shutdownHook.isRuntimeShutdownHookAdded()).isTrue();
}
@Test @Test
void runClosesContextsBeforeRunningHandlerActions() { void runClosesContextsBeforeRunningHandlerActions() {
TestSpringApplicationShutdownHook shutdownHook = new TestSpringApplicationShutdownHook(); TestSpringApplicationShutdownHook shutdownHook = new TestSpringApplicationShutdownHook();