Skip to content

S
spring-boot
Commit 60f3dd93 authored by Dave Syer's avatar Dave Syer
Browse files
Options

Be defensive about adding autoconfig report bean

parent 2e926601
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializer.java
View file @ 60f3dd93
...@@ -20,6 +20,7 @@ import java.util.Map; ...@@ -20,6 +20,7 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.SpringApplicationErrorHandler; import org.springframework.boot.SpringApplicationErrorHandler;
import org.springframework.boot.autoconfigure.AutoConfigurationReport.ConditionAndOutcome; import org.springframework.boot.autoconfigure.AutoConfigurationReport.ConditionAndOutcome;
...@@ -57,8 +58,10 @@ public class AutoConfigurationReportLoggingInitializer implements ...@@ -57,8 +58,10 @@ public class AutoConfigurationReportLoggingInitializer implements
@Override @Override
public void initialize(ConfigurableApplicationContext applicationContext) { public void initialize(ConfigurableApplicationContext applicationContext) {
this.loggerBean = new AutoConfigurationReportLogger(applicationContext); this.loggerBean = new AutoConfigurationReportLogger(applicationContext);
applicationContext.getBeanFactory().registerSingleton(LOGGER_BEAN, ConfigurableListableBeanFactory beanFactory = applicationContext.getBeanFactory();
this.loggerBean); if (!beanFactory.containsBean(LOGGER_BEAN)) {
beanFactory.registerSingleton(LOGGER_BEAN, this.loggerBean);
}
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment