Author: dkulp Date: Mon Jul 9 21:07:28 2012 New Revision: 1359395 URL: http://svn.apache.org/viewvc?rev=1359395&view=rev Log: Merged revisions 1359388 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1359388 | dkulp | 2012-07-09 17:02:44 -0400 (Mon, 09 Jul 2012) | 18 lines Merged revisions 1359378 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1359378 | dkulp | 2012-07-09 16:29:02 -0400 (Mon, 09 Jul 2012) | 10 lines 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.4.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java Modified: cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java?rev=1359395&r1=1359394&r2=1359395&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java (original) +++ cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java Mon Jul 9 21:07:28 2012 @@ -633,7 +633,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);
