Merge branch '2.7.x' into 3.0.x

Closes gh-38177
This commit is contained in:
Phillip Webb
2023-11-01 18:22:06 -07:00

View File

@@ -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