From 60f3dd9386ce3cae92e71d25032f8b059ff67838 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 19 Nov 2013 09:02:31 +0000 Subject: [PATCH] Be defensive about adding autoconfig report bean --- .../AutoConfigurationReportLoggingInitializer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializer.java index 9d2cbf0fe8..31013fe97c 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationReportLoggingInitializer.java @@ -20,6 +20,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplicationErrorHandler; import org.springframework.boot.autoconfigure.AutoConfigurationReport.ConditionAndOutcome; @@ -57,8 +58,10 @@ public class AutoConfigurationReportLoggingInitializer implements @Override public void initialize(ConfigurableApplicationContext applicationContext) { this.loggerBean = new AutoConfigurationReportLogger(applicationContext); - applicationContext.getBeanFactory().registerSingleton(LOGGER_BEAN, - this.loggerBean); + ConfigurableListableBeanFactory beanFactory = applicationContext.getBeanFactory(); + if (!beanFactory.containsBean(LOGGER_BEAN)) { + beanFactory.registerSingleton(LOGGER_BEAN, this.loggerBean); + } } @Override