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

Merge branch '3.0.x' into 3.1.x 

Closes gh-38178
This commit is contained in:
Phillip Webb 2023-11-01 18:22:28 -07:00
parent 7611ce1f13 e5c8723dda
commit 683d791104
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatWebServer.java
View File

@ -134,7 +134,7 @@ public class TomcatWebServer implements WebServer {
// Unlike Jetty, all Tomcat threads are daemon threads. We create a // Unlike Jetty, all Tomcat threads are daemon threads. We create a
// blocking non-daemon to stop immediate shutdown // blocking non-daemon to stop immediate shutdown
startDaemonAwaitThread(); startNonDaemonAwaitThread();
} }
catch (Exception ex) { catch (Exception ex) {
stopSilently(); stopSilently();
@ -189,7 +189,7 @@ public class TomcatWebServer implements WebServer {
} }
} }
private void startDaemonAwaitThread() { private void startNonDaemonAwaitThread() {
Thread awaitThread = new Thread("container-" + (containerCounter.get())) { Thread awaitThread = new Thread("container-" + (containerCounter.get())) {
@Override @Override