From 061b2c91a0bc979e722aeb6ed02060e9c8744f44 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 19 Aug 2010 07:53:48 +0000
Subject: [PATCH] SPR-7474 - AbstractXmlStreamReader getAttributeValue(String,
 String) does not handle null namespaceURI properly

---
 .../org/springframework/util/xml/AbstractXMLStreamReader.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java b/org.springframework.core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
index 01150501f3..0ec61f2e5b 100644
--- a/org.springframework.core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
+++ b/org.springframework.core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
@@ -149,7 +149,8 @@ abstract class AbstractXMLStreamReader implements XMLStreamReader {
 	public String getAttributeValue(String namespaceURI, String localName) {
 		for (int i = 0; i < getAttributeCount(); i++) {
 			QName name = getAttributeName(i);
-			if (name.getNamespaceURI().equals(namespaceURI) && name.getLocalPart().equals(localName)) {
+			if (name.getLocalPart().equals(localName) &&
+					(namespaceURI == null || name.getNamespaceURI().equals(namespaceURI))) {
 				return getAttributeValue(i);
 			}
 		}
-- 
GitLab