From eecb15d1bacef1241c3320e5b69c10fc9eed8827 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 1 Nov 2023 18:21:36 -0700 Subject: [PATCH] Rename startDaemonAwaitThread() inside TomcatWebServer to match intent Closes gh-38155 --- .../boot/web/embedded/tomcat/TomcatWebServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatWebServer.java index ada699327f7..00a33859fd5 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatWebServer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatWebServer.java @@ -134,7 +134,7 @@ public class TomcatWebServer implements WebServer { // Unlike Jetty, all Tomcat threads are daemon threads. We create a // blocking non-daemon to stop immediate shutdown - startDaemonAwaitThread(); + startNonDaemonAwaitThread(); } catch (Exception ex) { stopSilently(); @@ -189,7 +189,7 @@ public class TomcatWebServer implements WebServer { } } - private void startDaemonAwaitThread() { + private void startNonDaemonAwaitThread() { Thread awaitThread = new Thread("container-" + (containerCounter.get())) { @Override