Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 12550 invoked from network); 2 Jan 2008 21:53:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jan 2008 21:53:11 -0000 Received: (qmail 82475 invoked by uid 500); 2 Jan 2008 21:52:59 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 82413 invoked by uid 500); 2 Jan 2008 21:52:59 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 82404 invoked by uid 99); 2 Jan 2008 21:52:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 13:52:59 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 21:52:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2585A1A9832; Wed, 2 Jan 2008 13:52:50 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608248 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java Date: Wed, 02 Jan 2008 21:52:49 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080102215250.2585A1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Jan 2 13:52:49 2008 New Revision: 608248 URL: http://svn.apache.org/viewvc?rev=608248&view=rev Log: Merged revisions 606145 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r606145 | mmao | 2007-12-21 04:30:23 -0500 (Fri, 21 Dec 2007) | 5 lines * SOAPAction from the jaxws context should affect the soap:header as well * Add an empty soap header if the head is empty * Update the systest ........ Modified: incubator/cxf/branches/2.0.x-fixes/ (props changed) incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java Propchange: incubator/cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java?rev=608248&r1=608247&r2=608248&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java (original) +++ incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java Wed Jan 2 13:52:49 2008 @@ -102,6 +102,9 @@ if (message.hasHeaders()) { replaceHeaders(soapMessage, message); } + if (soapMessage.getSOAPHeader() == null) { + soapMessage.getSOAPPart().getEnvelope().addHeader(); + } XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class); StaxUtils.readDocElements(soapMessage.getSOAPBody(), xmlReader, true); @@ -109,7 +112,7 @@ xmlReader = StaxUtils.createXMLStreamReader(bodySource); xmlReader.nextTag(); xmlReader.nextTag(); // move past body tag - message.setContent(XMLStreamReader.class, xmlReader); + message.setContent(XMLStreamReader.class, xmlReader); } catch (SOAPException soape) { throw new SoapFault(new org.apache.cxf.common.i18n.Message( "SOAPHANDLERINTERCEPTOR_EXCEPTION", BUNDLE), soape,