Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SPR-6017] a few more tweaks to how getLocalName is handled

Browse Source
This commit is contained in:
Rob Harrop
2009-09-14 10:43:04 +00:00
parent ee0a59d464
commit 7835e66abb
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
View File

@@ -59,7 +59,8 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars
String id = resolveId(element, definition, parserContext);
if (!StringUtils.hasText(id)) {
parserContext.getReaderContext().error(
"Id is required for element '" + element.getLocalName() + "' when used as a top-level tag", element);
"Id is required for element '" + parserContext.getDelegate().getLocalName(element)
+ "' when used as a top-level tag", element);
}
BeanDefinitionHolder holder = new BeanDefinitionHolder(definition, id);
registerBeanDefinition(holder, parserContext.getRegistry());

2
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
View File

@@ -63,7 +63,7 @@ public class SimplePropertyNamespaceHandler implements NamespaceHandler {
public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
if (node instanceof Attr) {
Attr attr = (Attr) node;
String propertyName = attr.getLocalName();
String propertyName = parserContext.getDelegate().getLocalName(attr);
String propertyValue = attr.getValue();
MutablePropertyValues pvs = definition.getBeanDefinition().getPropertyValues();
if (pvs.contains(propertyName)) {