Return-Path: 
 <commits-return-34406-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
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 9E820172DD
	for <apmail-cxf-commits-archive@www.apache.org>;
 Tue, 28 Oct 2014 18:30:15 +0000 (UTC)
Received: (qmail 39554 invoked by uid 500); 28 Oct 2014 18:30:15 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 39367 invoked by uid 500); 28 Oct 2014 18:30:15 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 39137 invoked by uid 99); 28 Oct 2014 18:30:15 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Oct 2014 18:30:15 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 23CDE9969B3; Tue, 28 Oct 2014 18:30:15 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dkulp@apache.org
To: commits@cxf.apache.org
Date: Tue, 28 Oct 2014 18:30:18 -0000
Message-Id: <bfa77a4a36b04279a41995e0a8b569ce@git.apache.org>
In-Reply-To: <c4e888a5fcad489f99629d3b5f47a50e@git.apache.org>
References: <c4e888a5fcad489f99629d3b5f47a50e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [4/5] git commit: [CXF-6030] Add an NPE guard and remove "null"
 headers

[CXF-6030] Add an NPE guard and remove "null" headers


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/63d56507
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/63d56507
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/63d56507

Branch: refs/heads/2.7.x-fixes
Commit: 63d56507b0541cfa049a8dbaf91f2f66157c88ac
Parents: 9e171ed
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Oct 28 14:11:39 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Tue Oct 28 14:30:05 2014 -0400

----------------------------------------------------------------------
 .../binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/63d56507/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
index 0a5a4e7..48e47a6 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
@@ -34,13 +34,12 @@ public class SoapHeaderOutFilterInterceptor extends AbstractSoapInterceptor {
     }
 
     public void handleMessage(SoapMessage message) throws Fault {
-        // TODO Auto-generated method stub
         Iterator<Header> iter =  message.getHeaders().iterator();
         
         while (iter.hasNext()) {
             Header hdr  = iter.next();
             //Only remove inbound marked headers..
-            if (hdr.getDirection() == Header.Direction.DIRECTION_IN) {
+            if (hdr == null || hdr.getDirection() == Header.Direction.DIRECTION_IN) {
                 iter.remove(); 
             }
         }