Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8BA65DE46 for ; Mon, 9 Jul 2012 21:07:49 +0000 (UTC) Received: (qmail 15313 invoked by uid 500); 9 Jul 2012 21:07:49 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 15210 invoked by uid 500); 9 Jul 2012 21:07:49 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 15202 invoked by uid 99); 9 Jul 2012 21:07:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2012 21:07:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2012 21:07:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 026FB23888E7; Mon, 9 Jul 2012 21:07:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1359395 - /cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java Date: Mon, 09 Jul 2012 21:07:28 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120709210729.026FB23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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);