From commits-return-49194-archive-asf-public=cust-asf.ponee.io@cxf.apache.org Wed May 16 11:34:09 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id B972C180669 for ; Wed, 16 May 2018 11:34:08 +0200 (CEST) Received: (qmail 81790 invoked by uid 500); 16 May 2018 09:34:07 -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 81781 invoked by uid 99); 16 May 2018 09:34:07 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 May 2018 09:34:07 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A2CE380A7C; Wed, 16 May 2018 09:34:06 +0000 (UTC) Date: Wed, 16 May 2018 09:34:06 +0000 To: "commits@cxf.apache.org" Subject: [cxf] branch master updated: [CXF-7740]add NPE guard for SAAJStreamWriter MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152646324656.4845.5070546841863049734@gitbox.apache.org> From: ffang@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: cxf X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 2508201c48a4946ae6133e5323cba871bb9f9a18 X-Git-Newrev: 071aae5b948f233c9202dbfa90444afeea116037 X-Git-Rev: 071aae5b948f233c9202dbfa90444afeea116037 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/master by this push: new 071aae5 [CXF-7740]add NPE guard for SAAJStreamWriter 071aae5 is described below commit 071aae5b948f233c9202dbfa90444afeea116037 Author: Freeman Fang AuthorDate: Wed May 16 17:33:51 2018 +0800 [CXF-7740]add NPE guard for SAAJStreamWriter --- .../java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java index 64fe247..1dced4b 100644 --- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java +++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java @@ -133,8 +133,13 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter { setChild(adjustPrefix(getEnvelope(), prefix), false); adjustPrefix(getEnvelope().getHeader(), prefix); adjustPrefix(getEnvelope().getBody(), prefix); - getEnvelope().removeChild(getEnvelope().getHeader()); - getEnvelope().removeChild(getEnvelope().getBody()); + if (getEnvelope().getHeader() != null) { + getEnvelope().removeChild(getEnvelope().getHeader()); + } + if (getEnvelope().getBody() != null) { + getEnvelope().removeChild(getEnvelope().getBody()); + } + return; } else if ("Body".equals(local)) { if (getEnvelope().getBody() == null) { -- To stop receiving notification emails like this one, please contact ffang@apache.org.