From 36d2f505c329bd24fcd56546754b83bb330c71e4 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 18 Dec 2008 13:27:20 +0000 Subject: [PATCH] INT-532 --- .../config/xml/IntegrationNamespaceHandler.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java index 03c97c7ba9..198307892e 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java @@ -61,11 +61,14 @@ public class IntegrationNamespaceHandler implements NamespaceHandler { synchronized (this.initializationMonitor) { if (!this.initialized) { String postProcessorSimpleClassName = "DefaultConfiguringBeanFactoryPostProcessor"; - BeanDefinitionBuilder postProcessorBuilder = BeanDefinitionBuilder.genericBeanDefinition( - IntegrationNamespaceUtils.BASE_PACKAGE + ".config.xml." + postProcessorSimpleClassName); - BeanDefinitionHolder postProcessorHolder = new BeanDefinitionHolder(postProcessorBuilder.getBeanDefinition(), - IntegrationNamespaceUtils.BASE_PACKAGE + ".internal" + postProcessorSimpleClassName); - BeanDefinitionReaderUtils.registerBeanDefinition(postProcessorHolder, parserContext.getRegistry()); + String postProcessorBeanName = IntegrationNamespaceUtils.BASE_PACKAGE + ".internal" + postProcessorSimpleClassName; + if (!parserContext.getRegistry().isBeanNameInUse(postProcessorBeanName)) { + BeanDefinitionBuilder postProcessorBuilder = BeanDefinitionBuilder.genericBeanDefinition( + IntegrationNamespaceUtils.BASE_PACKAGE + ".config.xml." + postProcessorSimpleClassName); + BeanDefinitionHolder postProcessorHolder = new BeanDefinitionHolder( + postProcessorBuilder.getBeanDefinition(), postProcessorBeanName); + BeanDefinitionReaderUtils.registerBeanDefinition(postProcessorHolder, parserContext.getRegistry()); + } this.initialized = true; } }