svn commit: r1439264 - in /cxf/branches/2.7.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java

[ffang]

Author: ffang
Date: Mon Jan 28 05:56:22 2013
New Revision: 1439264

URL: http://svn.apache.org/viewvc?rev=1439264&view=rev
Log:
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.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1439260

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.7.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.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java?rev=1439264&r1=1439263&r2=1439264&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
 Mon Jan 28 05:56:22 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) {