Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 21416 invoked from network); 30 Mar 2009 21:23:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Mar 2009 21:23:14 -0000 Received: (qmail 45145 invoked by uid 500); 30 Mar 2009 21:23:14 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 45054 invoked by uid 500); 30 Mar 2009 21:23:14 -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 45045 invoked by uid 99); 30 Mar 2009 21:23:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Mar 2009 21:23:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 30 Mar 2009 21:23:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A294B23889FD; Mon, 30 Mar 2009 21:22:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r760180 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java Date: Mon, 30 Mar 2009 21:22:53 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090330212253.A294B23889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Mar 30 21:22:51 2009 New Revision: 760180 URL: http://svn.apache.org/viewvc?rev=760180&view=rev Log: Merged revisions 760178 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r760178 | dkulp | 2009-03-30 17:15:23 -0400 (Mon, 30 Mar 2009) | 2 lines [CXF-2122] Fix potential NPE in the method invoker. Fix from Richard Opalka applied. ........ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 30 21:22:51 2009 @@ -1 +1 @@ -/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759961,759963-759964,759966,760029,760073,760150 +/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759961,759963-759964,759966,760029,760073,760150,760178 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java?rev=760180&r1=760179&r2=760180&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java Mon Mar 30 21:22:51 2009 @@ -127,9 +127,11 @@ List list = (List) ctx.get(Header.HEADER_LIST); if (list != null && !list.isEmpty()) { SoapMessage sm = (SoapMessage) createResponseMessage(exchange); - Iterator iter = list.iterator(); - while (iter.hasNext()) { - sm.getHeaders().add((Header) iter.next()); + if (sm != null) { + Iterator iter = list.iterator(); + while (iter.hasNext()) { + sm.getHeaders().add((Header) iter.next()); + } } } }