From 1015f79b42959331a4eb977b99ee52c31c8f08bc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 12 May 2020 16:38:33 +0100 Subject: [PATCH] Include timeout unit in shutdown failure logging Closes gh-25058 --- .../context/support/DefaultLifecycleProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f69ac9e841f..4542cdabb73 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 @@ -386,7 +386,7 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor if (latch.getCount() > 0 && !countDownBeanNames.isEmpty() && logger.isInfoEnabled()) { logger.info("Failed to shut down " + countDownBeanNames.size() + " bean" + (countDownBeanNames.size() > 1 ? "s" : "") + " with phase value " + - this.phase + " within timeout of " + this.timeout + ": " + countDownBeanNames); + this.phase + " within timeout of " + this.timeout + "ms: " + countDownBeanNames); } } catch (InterruptedException ex) {