Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 81161 invoked from network); 30 Jun 2010 18:14:57 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 30 Jun 2010 18:14:57 -0000 Received: (qmail 58528 invoked by uid 500); 30 Jun 2010 18:14:57 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 58458 invoked by uid 500); 30 Jun 2010 18:14:56 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 58451 invoked by uid 99); 30 Jun 2010 18:14:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jun 2010 18:14:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jun 2010 18:14:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E761B23889EA; Wed, 30 Jun 2010 18:13:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r959396 - in /cxf/branches/2.2.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java Date: Wed, 30 Jun 2010 18:13:30 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100630181330.E761B23889EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Jun 30 18:13:30 2010 New Revision: 959396 URL: http://svn.apache.org/viewvc?rev=959396&view=rev Log: Merged revisions 959394 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r959394 | dkulp | 2010-06-30 14:12:00 -0400 (Wed, 30 Jun 2010) | 1 line If only one return param, it's already mapped. Return ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java Propchange: cxf/branches/2.2.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.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.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?rev=959396&r1=959395&r2=959396&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java (original) +++ cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java Wed Jun 30 18:13:30 2010 @@ -441,11 +441,9 @@ public class ParameterProcessor extends jreturn.setTargetNamespace(""); } method.setReturn(jreturn); - return; } - + return; } - for (QName outElement : outputWrapElement) { if ("return".equals(outElement.getLocalPart())) { if (method.getReturn() != null) { @@ -500,7 +498,7 @@ public class ParameterProcessor extends } } } - + addParameter(method, jp); } }