Avoid registering ConfigurationPropertiesBindingPostProcessor twice

217ec5d5 · Dave Syer · e4d594cc · 217ec5d5
Commit 217ec5d5 authored Nov 01, 2013 by Dave Syer
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

ConfigurationPropertiesBindingPostProcessorRegistrar.java ...ConfigurationPropertiesBindingPostProcessorRegistrar.java +5 -3

No files found.
--- a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
@@ -38,9 +38,11 @@ public class ConfigurationPropertiesBindingPostProcessorRegistrar implements
 	@Override
 	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
 			BeanDefinitionRegistry registry) {
-		BeanDefinition beanDefinition = new RootBeanDefinition(
-				ConfigurationPropertiesBindingPostProcessor.class);
-		registry.registerBeanDefinition(BINDER_BEAN_NAME, beanDefinition);
+		if (!registry.containsBeanDefinition(BINDER_BEAN_NAME)) {
+			BeanDefinition beanDefinition = new RootBeanDefinition(
+					ConfigurationPropertiesBindingPostProcessor.class);
+			registry.registerBeanDefinition(BINDER_BEAN_NAME, beanDefinition);
+		}
 	}

 }