From 7d37c92e4f2e924a033a619e4c80f9e79120a779 Mon Sep 17 00:00:00 2001 From: Rob Harrop Date: Mon, 14 Sep 2009 10:02:15 +0000 Subject: [PATCH] [SPR-6017] a few more tweaks to the BeanDefinitionParserDelegate public contract --- .../beans/factory/xml/BeanDefinitionParserDelegate.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java index eb86869264e..0004bf56195 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java @@ -1408,14 +1408,15 @@ public class BeanDefinitionParserDelegate { /** * Determines whether the name of the supplied node is equal to the supplied name. - * The default implementation delegates to {@link DomUtils#nodeNameEquals}. - * Subclasses may override the default implementatino to provide a different mechanism for comparing node names. + * The default implementation checks the supplied desired name against both {@link Node#getNodeName) + * and {@link #getLoclName}. + * Subclasses may override the default implementation to provide a different mechanism for comparing node names. * @param node the node to compare * @param desiredName the name to check for * @return true if the names are equal otherwise false. */ public boolean nodeNameEquals(Node node, String desiredName) { - return DomUtils.nodeNameEquals(node, desiredName); + return desiredName.equals(node.getNodeName()) || desiredName.equals(getLocalName(node)); } /**