You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/07/09 22:29:02 UTC
svn commit: r1359378 -
/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/helpers/DOMUtils.java
Author: dkulp
Date: Mon Jul 9 20:29:02 2012
New Revision: 1359378
URL: http://svn.apache.org/viewvc?rev=1359378&view=rev
Log:
Merged revisions 1358045 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1358045 | ema | 2012-07-06 01:24:17 -0400 (Fri, 06 Jul 2012) | 2 lines
[CXF-4408]:Fix NPE in DOMUtils when soap header contains null namespace element
........
Modified:
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/helpers/DOMUtils.java
Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/helpers/DOMUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/helpers/DOMUtils.java?rev=1359378&r1=1359377&r2=1359378&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/helpers/DOMUtils.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/helpers/DOMUtils.java Mon Jul 9 20:29:02 2012
@@ -653,7 +653,8 @@ public final class DOMUtils {
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);