cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r836320 - in /cxf/branches/2.1.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
Date Sun, 15 Nov 2009 03:59:23 GMT
Author: dkulp
Date: Sun Nov 15 03:59:22 2009
New Revision: 836320

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

................
  r836117 | dkulp | 2009-11-13 23:16:24 -0500 (Fri, 13 Nov 2009) | 9 lines
  
  Merged revisions 836116 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r836116 | dkulp | 2009-11-13 23:13:13 -0500 (Fri, 13 Nov 2009) | 1 line
    
    Fix build failure
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java

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

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?rev=836320&r1=836319&r2=836320&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
Sun Nov 15 03:59:22 2009
@@ -297,7 +297,8 @@
                 } else if (isSamePart(inpart, outpart)) {
                     boolean found = false;
                     for (JavaParameter p : method.getParameters()) {
-                        if (p.getQName().equals(ProcessorUtil.getElementName(outpart))) {
+                        if (p.getQName().equals(ProcessorUtil.getElementName(outpart))
+                            && p.getPartName().equals(outpart.getName().getLocalPart()))
{
                             p.setHolder(true);
                             p.setHolderName(javax.xml.ws.Holder.class.getName());
                             String holderClass = p.getClassName();



Mime
View raw message