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

Merge branch '3.3.x'

This commit is contained in:
Phillip Webb 2024-12-17 09:50:58 -08:00
parent f5a4bf0302 495665aec0
commit 724dea634d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,8 +16,10 @@
package org.springframework.boot;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.TimeUnit;
@ -103,12 +105,13 @@ class SpringApplicationShutdownHook implements Runnable {
public void run() {
Set<ConfigurableApplicationContext> contexts;
Set<ConfigurableApplicationContext> closedContexts;
Set<Handler> handlers;
List<Handler> handlers;
synchronized (SpringApplicationShutdownHook.class) {
this.inProgress = true;
contexts = new LinkedHashSet<>(this.contexts);
closedContexts = new LinkedHashSet<>(this.closedContexts);
handlers = new LinkedHashSet<>(this.handlers.getActions());
handlers = new ArrayList<>(this.handlers.getActions());
Collections.reverse(handlers);
}
contexts.forEach(this::closeAndWait);
closedContexts.forEach(this::closeAndWait);

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

@ -207,7 +207,7 @@ class SpringApplicationShutdownHookTests {
}
@Test
void handlersRunInDeterministicOrder() {
void handlersRunInDeterministicOrderFromLastRegisteredToFirst() {
TestSpringApplicationShutdownHook shutdownHook = new TestSpringApplicationShutdownHook();
Runnable r1 = mock(Runnable.class);
Runnable r2 = mock(Runnable.class);
@ -217,9 +217,9 @@ class SpringApplicationShutdownHookTests {
shutdownHook.getHandlers().add(r3);
shutdownHook.run();
InOrder ordered = inOrder(r1, r2, r3);
ordered.verify(r2).run();
ordered.verify(r1).run();
ordered.verify(r3).run();
ordered.verify(r1).run();
ordered.verify(r2).run();
ordered.verifyNoMoreInteractions();
}