Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5.x'

Browse Source 
See gh-26902
This commit is contained in:
Andy Wilkinson
2021-06-15 20:01:35 +01:00
parent a1a86e75ac 44187bc6bf
commit e0d0be97c5
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestarterTests.java
View File

@@ -22,6 +22,7 @@ import java.time.Duration;
import java.util.Collection;
import java.util.Collections;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicBoolean;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
@@ -177,7 +178,7 @@ class RestarterTests {
private int count = 0;
private static volatile boolean quit = false;
private static final AtomicBoolean restart = new AtomicBoolean();
@Scheduled(fixedDelay = 200)
void tickBean() {
@@ -186,8 +187,7 @@ class RestarterTests {
@Scheduled(initialDelay = 500, fixedDelay = 500)
void restart() {
System.out.println("Restart " + Thread.currentThread());
if (!SampleApplication.quit) {
if (SampleApplication.restart.compareAndSet(false, true)) {
Restarter.getInstance().restart();
}
}
@@ -198,18 +198,6 @@ class RestarterTests {
SampleApplication.class);
context.addApplicationListener(new CloseCountingApplicationListener());
Restarter.getInstance().prepare(context);
System.out.println("Sleep " + Thread.currentThread());
sleep();
quit = true;
}
private static void sleep() {
try {
Thread.sleep(1200);
}
catch (InterruptedException ex) {
// Ignore
}
}
}