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 2013/01/28 07:19:57 UTC
svn commit: r1439268 - in /cxf/branches/2.6.x-fixes: ./
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
Author: ffang
Date: Mon Jan 28 06:19:57 2013
New Revision: 1439268
URL: http://svn.apache.org/viewvc?rev=1439268&view=rev
Log:
Merged revisions 1439264 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1439264 | ffang | 2013-01-28 13:56:22 +0800 (一, 28 1 2013) | 9 lines
Merged revisions 1439260 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1439260 | ffang | 2013-01-28 13:50:01 +0800 (一, 28 1 2013) | 1 line
[CXF-4784]enhance CXF to follow jaxws spec 3.6.2.3 when using RI or Axis2 client
........
................
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.7.x-fixes:r1439264
Merged /cxf/trunk:r1439260
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java?rev=1439268&r1=1439267&r2=1439268&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java (original)
+++ cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java Mon Jan 28 06:19:57 2013
@@ -60,20 +60,22 @@ public class RPCOutInterceptor extends A
List<MessagePartInfo> parts = null;
+ boolean output = false;
if (!isRequestor(message)) {
parts = operation.getOutput().getMessageParts();
- addOperationNode(nsStack, message, xmlWriter, true, operation);
+ output = true;
} else {
parts = operation.getInput().getMessageParts();
- addOperationNode(nsStack, message, xmlWriter, false, operation);
+ output = false;
}
-
+
MessageContentsList objs = MessageContentsList.getContentsList(message);
if (objs == null) {
+ addOperationNode(nsStack, message, xmlWriter, output, operation);
+ xmlWriter.writeEndElement();
return;
}
-
-
+
for (MessagePartInfo part : parts) {
if (objs.hasValue(part)) {
Object o = objs.get(part);
@@ -87,8 +89,10 @@ public class RPCOutInterceptor extends A
// part.setConcreteName(new QName("", part.getConcreteName().getLocalPart()));
}
}
+
+ addOperationNode(nsStack, message, xmlWriter, output, operation);
writeParts(message, message.getExchange(), operation, objs, parts);
-
+
// Finishing the writing.
xmlWriter.writeEndElement();
} catch (XMLStreamException e) {