Skip to content

Commit b9cb575

Browse files
committed
Adapt to latest changes in the locking model for context close
Closes spring-projectsgh-49154 See spring-projects/spring-framework#36260
1 parent 711f96d commit b9cb575

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void runWhenContextIsBeingClosedInAnotherThreadWaitsUntilContextIsInactive() thr
117117
Thread shutdownThread = new Thread(shutdownHook);
118118
shutdownThread.start();
119119
// Shutdown thread should start waiting for context to become inactive
120-
Awaitility.await().atMost(Duration.ofSeconds(30)).until(shutdownThread::getState, State.WAITING::equals);
120+
Awaitility.await().atMost(Duration.ofSeconds(30)).until(shutdownThread::getState, State.TIMED_WAITING::equals);
121121
// Allow context thread to proceed, unblocking shutdown thread
122122
proceedWithClose.countDown();
123123
contextThread.join();

0 commit comments

Comments
 (0)