From 6fc190ec258eda64c5e1fbcedb50a2a9ecebb58f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 23 Sep 2009 13:51:14 +0000
Subject: [PATCH] AbstractBeanDefinitionParser can deal with null return value
 as well (SPR-5872)

---
 .../beans/factory/xml/AbstractBeanDefinitionParser.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
index 4fb7a66143..66e63dd3e8 100644
--- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
+++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * 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");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars
 
 	public final BeanDefinition parse(Element element, ParserContext parserContext) {
 		AbstractBeanDefinition definition = parseInternal(element, parserContext);
-		if (!parserContext.isNested()) {
+		if (definition != null && !parserContext.isNested()) {
 			try {
 				String id = resolveId(element, definition, parserContext);
 				if (!StringUtils.hasText(id)) {
-- 
GitLab