From 226256e2642ffad4c24d81ca4f4cb15cd7714d7c Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 28 Jul 2011 02:21:22 +0000
Subject: [PATCH] Respect <description> within <entry> per beans XSD

Prior to this change, a parsing exception would be thrown if a
<description> element was placed within a <map><entry/></map>
element. The beans XSD has always permitted this arrangement,
but BeanDefinitionParserDelegate did not respect it. The latter now
simply ignores any <description> element, rather than failing.

Issue: SPR-8563
---
 .../factory/xml/BeanDefinitionParserDelegate.java    |  5 ++++-
 .../beans/factory/xml/collections.xml                | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

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 17ba6b8487..566dc0ed7e 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
@@ -1255,7 +1255,10 @@ public class BeanDefinitionParserDelegate {
 					}
 					else {
 						// Child element is what we're looking for.
-						if (valueEle != null) {
+						if (nodeNameEquals(candidateEle, DESCRIPTION_ELEMENT)) {
+							// the element is a <description> -> ignore it
+						}
+						else if (valueEle != null) {
 							error("<entry> element must not contain more than one value sub-element", entryEle);
 						}
 						else {
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
index 33d2f20698..9d772d3fd5 100644
--- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
+++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
@@ -155,6 +155,18 @@
 		</property>
 	</bean>
 
+	<!-- The <description> element below caused parsing exception prior to resolution of SPR-8563 -->
+	<bean id="mapWithDescriptionInEntry" class="org.springframework.beans.factory.xml.HasMap">
+		<property name="map">
+			<map>
+				<entry key="e1">
+					<description>A map entry with a description</description>
+					<value>v1</value>
+				</entry>
+			</map>
+		</property>
+	</bean>
+
 	<bean id="fooKey" class="java.lang.String">
 		<constructor-arg value="foo"/>
 	</bean>