提交 6fc190ec 编写于 作者: J Juergen Hoeller

AbstractBeanDefinitionParser can deal with null return value as well (SPR-5872)

上级 438f128d
/* /*
* Copyright 2002-2007 the original author or authors. * Copyright 2002-2009 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -54,7 +54,7 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars ...@@ -54,7 +54,7 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars
public final BeanDefinition parse(Element element, ParserContext parserContext) { public final BeanDefinition parse(Element element, ParserContext parserContext) {
AbstractBeanDefinition definition = parseInternal(element, parserContext); AbstractBeanDefinition definition = parseInternal(element, parserContext);
if (!parserContext.isNested()) { if (definition != null && !parserContext.isNested()) {
try { try {
String id = resolveId(element, definition, parserContext); String id = resolveId(element, definition, parserContext);
if (!StringUtils.hasText(id)) { if (!StringUtils.hasText(id)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册