cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
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 GMT
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,



Mime
View raw message