Merge branch '3.0.x' into 3.1.x

Closes spring-projectsgh-38178
scottfrederick · Nov 2, 2023 · 683d791 · 683d791
2 parents 7611ce1 + e5c8723
commit 683d791
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatWebServer.java b/...ring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatWebServer.java
@@ -134,7 +134,7 @@ private void initialize() throws WebServerException {
 
 				// 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 @@ private void rethrowDeferredStartupExceptions() throws Exception {
 		}
 	}
 
-	private void startDaemonAwaitThread() {
+	private void startNonDaemonAwaitThread() {
 		Thread awaitThread = new Thread("container-" + (containerCounter.get())) {
 
 			@Override