[jbossws-commits] JBossWS SVN: r16461 - thirdparty/cxf/branches/cxf-2.2.12-soa/common/common/src/main/java/org/apache/cxf/helpers.
Author: alessio.soldano(a)jboss.com
Date: 2012-07-11 12:09:29 -0400 (Wed, 11 Jul 2012)
New Revision: 16461
Modified:
thirdparty/cxf/branches/cxf-2.2.12-soa/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java
Log:
[BZ-838409] Porting fix for CXF-4408
Modified:
thirdparty/cxf/branches/cxf-2.2.12-soa/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java
===================================================================
---
thirdparty/cxf/branches/cxf-2.2.12-soa/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java 2012-07-11
15:48:35 UTC (rev 16460)
+++
thirdparty/cxf/branches/cxf-2.2.12-soa/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java 2012-07-11
16:09:29 UTC (rev 16461)
@@ -621,7 +621,8 @@
private static void findAllElementsByTagNameNS(Element el, String nameSpaceURI,
String localName,
List<Element> elementList) {
- if (localName.equals(el.getLocalName()) &&
nameSpaceURI.contains(el.getNamespaceURI())) {
+ if (el.getNamespaceURI() != null && localName.equals(el.getLocalName())
+ && nameSpaceURI.contains(el.getNamespaceURI())) {
elementList.add(el);
}
Element elem = getFirstElement(el);