Merge branch '3.0.x' into 3.1.x

philwebb · philwebb · commit 683d79110469 · 2023-11-01T18:22:28.000-07:00
Closes gh-38178
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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ private void initialize() throws WebServerException {`
`134`	`134`
`135`	`135`	`// Unlike Jetty, all Tomcat threads are daemon threads. We create a`
`136`	`136`	`// blocking non-daemon to stop immediate shutdown`
`137`		`- startDaemonAwaitThread();`
	`137`	`+ startNonDaemonAwaitThread();`
`138`	`138`	`}`
`139`	`139`	`catch (Exception ex) {`
`140`	`140`	`stopSilently();`
`@@ -189,7 +189,7 @@ private void rethrowDeferredStartupExceptions() throws Exception {`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`192`		`- private void startDaemonAwaitThread() {`
	`192`	`+ private void startNonDaemonAwaitThread() {`
`193`	`193`	`Thread awaitThread = new Thread("container-" + (containerCounter.get())) {`
`194`	`194`
`195`	`195`	`@Override`