From 1db9faf24838b5df83238e36312e9f721f11fa80 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <juergen.hoeller@broadcom.com>
Date: Sat, 31 Aug 2024 12:00:26 +0200
Subject: [PATCH] Avoid shutdown timeout in case of exception on stop

Closes gh-33442
---
 .../context/support/DefaultLifecycleProcessor.java             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
index 1a81210d58..bd351637b4 100644
--- a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
@@ -371,6 +371,9 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 				if (logger.isWarnEnabled()) {
 					logger.warn("Failed to stop bean '" + beanName + "'", ex);
 				}
+				if (bean instanceof SmartLifecycle) {
+					latch.countDown();
+				}
 			}
 		}
 	}