cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r775954 - in /cxf/branches/2.1.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
Date Mon, 18 May 2009 14:00:06 GMT
Author: dkulp
Date: Mon May 18 14:00:02 2009
New Revision: 775954

URL: http://svn.apache.org/viewvc?rev=775954&view=rev
Log:
Merged revisions 775423 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r775423 | dkulp | 2009-05-16 03:23:50 -0400 (Sat, 16 May 2009) | 2 lines
  
  [CXF-2221] Fix for code generation of out of band headers set in
  multiple bindings causing them to always be OUT only
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 18 14:00:02 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423

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

Modified: cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=775954&r1=775953&r2=775954&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Mon May 18 14:00:02 2009
@@ -512,7 +512,12 @@
                 || part.getName().equals(partNameFilter)) {
             
                 QName pqname = new QName(minfo.getName().getNamespaceURI(), part.getName());
-                MessagePartInfo pi = minfo.addOutOfBandMessagePart(pqname);
+                MessagePartInfo pi = minfo.getMessagePart(pqname);
+                if (pi != null
+                    && pi.getMessageInfo().getName().equals(msg.getQName())) {
+                    continue;
+                }
+                pi = minfo.addOutOfBandMessagePart(pqname);
                 
                 if (!minfo.getName().equals(msg.getQName())) {
                     pi.setMessageContainer(new MessageInfo(minfo.getOperation(), null, msg.getQName()));

Modified: cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java?rev=775954&r1=775953&r2=775954&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
Mon May 18 14:00:02 2009
@@ -32,6 +32,7 @@
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.tools.common.model.JavaType.Style;
 
 public class JavaMethod implements JavaAnnotatable {
     private static final Logger LOG = LogUtils.getL7dLogger(JavaMethod.class);
@@ -150,6 +151,9 @@
         int index = ((ArrayList)parameters).indexOf(p1);
         parameters.remove(index);
         parameters.add(index, p2);
+        if ((p1.isIN() && p2.isOUT()) || p1.isINOUT()) {
+            p2.setStyle(Style.INOUT);
+        }
     }
 
     private boolean isEquiv(String c1, String c2) {



Mime
View raw message