Browse Source

Reduced warn log entry without stacktrace for startup exceptions

Also, AbstractApplicationContext.isRunning avoids IllegalStateException now.

Issue: SPR-13663
Issue: SPR-13667
pull/931/head
Juergen Hoeller 10 years ago
parent
commit
5d6aab34cb
  1. 7
      spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java

7
spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java

@ -484,7 +484,10 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader @@ -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 @@ -1182,7 +1185,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
@Override
public boolean isRunning() {
return getLifecycleProcessor().isRunning();
return (this.lifecycleProcessor != null && this.lifecycleProcessor.isRunning());
}

Loading…
Cancel
Save