From 71543d7dcaf453b93daeb463233547a0078ce4b5 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 10 Dec 2008 16:30:42 +0000
Subject: [PATCH] Using the ParserContext's delegate instead of manually
 resolving the parser for custom elements.

---
 .../integration/config/xml/IntegrationNamespaceUtils.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
index 2587686a57..1308573b73 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
@@ -152,10 +152,8 @@ public abstract class IntegrationNamespaceUtils {
 			pollerMetadataRef = pollerElement.getAttribute("ref");
 		}
 		else {
-			ParserContext childContext = new ParserContext(
-					parserContext.getReaderContext(), parserContext.getDelegate(), targetBuilder.getBeanDefinition());
-			BeanDefinition beanDefinition = parserContext.getReaderContext().getNamespaceHandlerResolver().resolve(
-					pollerElement.getNamespaceURI()).parse(pollerElement, childContext);
+			BeanDefinition beanDefinition = parserContext.getDelegate().parseCustomElement(
+					pollerElement, targetBuilder.getBeanDefinition());
 			Assert.notNull(beanDefinition, "BeanDefinition must not be null");
 			Assert.isInstanceOf(AbstractBeanDefinition.class, beanDefinition);
 			pollerMetadataRef = BeanDefinitionReaderUtils.registerWithGeneratedName(