Skip to content

Commit 092a25d

Browse files
committed
SPR-4783: missing commit for bean def parser (duh)
1 parent dee410c commit 092a25d

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,16 @@
4444
* @author Rob Harrop
4545
* @author Juergen Hoeller
4646
* @author Rick Evans
47+
* @author Dave Syer
4748
* @since 2.0
4849
*/
4950
public abstract class AbstractBeanDefinitionParser implements BeanDefinitionParser {
5051

5152
/** Constant for the id attribute */
5253
public static final String ID_ATTRIBUTE = "id";
5354

55+
/** Constant for the name attribute */
56+
public static final String NAME_ATTRIBUTE = "name";
5457

5558
public final BeanDefinition parse(Element element, ParserContext parserContext) {
5659
AbstractBeanDefinition definition = parseInternal(element, parserContext);
@@ -62,7 +65,12 @@ public final BeanDefinition parse(Element element, ParserContext parserContext)
6265
"Id is required for element '" + parserContext.getDelegate().getLocalName(element)
6366
+ "' when used as a top-level tag", element);
6467
}
65-
BeanDefinitionHolder holder = new BeanDefinitionHolder(definition, id);
68+
String[] aliases = new String[0];
69+
String name = element.getAttribute(NAME_ATTRIBUTE);
70+
if (StringUtils.hasLength(name)) {
71+
aliases = StringUtils.trimArrayElements(StringUtils.commaDelimitedListToStringArray(name));
72+
}
73+
BeanDefinitionHolder holder = new BeanDefinitionHolder(definition, id, aliases);
6674
registerBeanDefinition(holder, parserContext.getRegistry());
6775
if (shouldFireEvents()) {
6876
BeanComponentDefinition componentDefinition = new BeanComponentDefinition(holder);

0 commit comments

Comments
 (0)