From 5d6aab34cbe3c4db38dd1698e246967716befcfd Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 14 Nov 2015 23:27:20 +0100 Subject: [PATCH] Reduced warn log entry without stacktrace for startup exceptions Also, AbstractApplicationContext.isRunning avoids IllegalStateException now. Issue: SPR-13663 Issue: SPR-13667 --- .../context/support/AbstractApplicationContext.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java index 1a86b79e955..7ae3d5fb59e 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java @@ -484,7 +484,10 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader } catch (BeansException ex) { - logger.warn("Exception encountered during context initialization - cancelling refresh attempt", ex); + if (logger.isWarnEnabled()) { + logger.warn("Exception encountered during context initialization - " + + "cancelling refresh attempt: " + ex); + } // Destroy already created singletons to avoid dangling resources. destroyBeans(); @@ -1182,7 +1185,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader @Override public boolean isRunning() { - return getLifecycleProcessor().isRunning(); + return (this.lifecycleProcessor != null && this.lifecycleProcessor.isRunning()); }