cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1439269 - in /cxf/branches/2.5.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
Date Mon, 28 Jan 2013 06:25:38 GMT
Author: ffang
Date: Mon Jan 28 06:25:37 2013
New Revision: 1439269

URL: http://svn.apache.org/viewvc?rev=1439269&view=rev
Log:
Merged revisions 1439268 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

................
  r1439268 | ffang | 2013-01-28 14:19:57 +0800 (一, 28  1 2013) | 16 lines
  
  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.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jan 28 06:25:37 2013
@@ -0,0 +1,3 @@
+/cxf/branches/2.6.x-fixes:1439268
+/cxf/branches/2.7.x-fixes:1439264
+/cxf/trunk:1439260

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

Modified: cxf/branches/2.5.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.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java?rev=1439269&r1=1439268&r2=1439269&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
Mon Jan 28 06:25:37 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) {



Mime
View raw message