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

Merge branch '2.3.x' into 2.4.x 

See gh-25481
This commit is contained in:
Andy Wilkinson 2021-03-03 17:56:16 +00:00
parent fefd49cce7 da3920bd46
commit f85c7c9ef1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java
View File

@ -64,6 +64,12 @@ abstract class AbstractApplicationLauncher implements BeforeEachCallback {
void destroyProcess() { void destroyProcess() {
if (this.process != null) { if (this.process != null) {
this.process.destroy(); this.process.destroy();
try {
this.process.waitFor();
}
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
} }
} }