You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2012/09/20 04:58:33 UTC
svn commit: r1387845 - in /cxf/branches/2.4.x-fixes: ./
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
Author: ffang
Date: Thu Sep 20 02:58:32 2012
New Revision: 1387845
URL: http://svn.apache.org/viewvc?rev=1387845&view=rev
Log:
Merged revisions 1387844 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1387844 | ffang | 2012-09-20 10:30:43 +0800 (四, 20 9 2012) | 1 line
[CXF-4511]WS-RM Sequence header should have mustUnderstand attribute
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.5.x-fixes:r1387844
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java?rev=1387845&r1=1387844&r2=1387845&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java Thu Sep 20 02:58:32 2012
@@ -46,6 +46,7 @@ import org.w3c.dom.Node;
import org.apache.cxf.binding.Binding;
import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.binding.soap.SoapFault;
+import org.apache.cxf.binding.soap.SoapHeader;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.SoapVersion;
import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
@@ -226,7 +227,13 @@ public class RMSoapInterceptor extends A
message.put(Message.RESPONSE_CODE, HttpURLConnection.HTTP_OK);
}
while (node != null) {
- Header holder = new Header(new QName(node.getNamespaceURI(), node.getLocalName()), node);
+ Header holder = null;
+ if (node.getLocalName().equals("Sequence")) {
+ holder = new SoapHeader(new QName(node.getNamespaceURI(), node.getLocalName()), node);
+ ((SoapHeader)holder).setMustUnderstand(true);
+ } else {
+ holder = new Header(new QName(node.getNamespaceURI(), node.getLocalName()), node);
+ }
header.add(holder);
node = node.getNextSibling();
}