From 217ec5d564c22054861b7699a3d1432b7210d9b9 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Fri, 1 Nov 2013 11:57:47 +0000
Subject: [PATCH] Avoid registering ConfigurationPropertiesBindingPostProcessor
 twice

---
 ...figurationPropertiesBindingPostProcessorRegistrar.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 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
index 04489109a8..b84b1f5100 100644
--- 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);
+		}
 	}
 
 }