Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 88449 invoked from network); 4 Sep 2007 11:45:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Sep 2007 11:45:23 -0000 Received: (qmail 33414 invoked by uid 500); 4 Sep 2007 11:45:18 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 33294 invoked by uid 500); 4 Sep 2007 11:45:18 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 33285 invoked by uid 99); 4 Sep 2007 11:45:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Sep 2007 04:45:18 -0700 X-ASF-Spam-Status: No, hits=-98.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Sep 2007 11:45:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 91A811A9838; Tue, 4 Sep 2007 04:44:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r572631 - in /incubator/cxf/trunk/tools/wsdlto: frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/ test/src/test/resources/wsdl2java_wsdl/ Date: Tue, 04 Sep 2007 11:44:51 -0000 To: cxf-commits@incubator.apache.org From: mmao@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070904114451.91A811A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mmao Date: Tue Sep 4 04:44:50 2007 New Revision: 572631 URL: http://svn.apache.org/viewvc?rev=572631&view=rev Log: CXF-967 * Fix the NPE in case of parameter ordering and no output message Added: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug967.wsdl Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?rev=572631&r1=572630&r2=572631&view=diff ============================================================================== --- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java (original) +++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java Tue Sep 4 04:44:50 2007 @@ -20,6 +20,7 @@ package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -28,7 +29,6 @@ import javax.wsdl.OperationType; import javax.xml.namespace.QName; - import org.apache.cxf.common.i18n.Message; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.jaxb.JAXBUtils; @@ -487,13 +487,20 @@ MessageInfo inputMessage, MessageInfo outputMessage, List parameterList) throws ToolException { - Map inputPartsMap = inputMessage.getMessagePartsMap(); - Map outputPartsMap = outputMessage.getMessagePartsMap(); + Map outputPartsMap = new HashMap(); + + if (outputMessage != null) { + outputPartsMap = outputMessage.getMessagePartsMap(); + } List inputParts = inputMessage.getMessageParts(); - List outputParts = outputMessage.getMessageParts(); + List outputParts = new ArrayList(); + + if (outputMessage != null) { + outputMessage.getMessageParts(); + } List inputUnlistedParts = new ArrayList(); List outputUnlistedParts = new ArrayList(); @@ -521,6 +528,8 @@ } else { processReturn(method, null); } + } else { + processReturn(method, null); } // now create list of paramModel with parts @@ -573,7 +582,11 @@ Iterator params = parameterOrder.iterator(); List inputParts = inputMessage.getMessageParts(); - List outputParts = outputMessage.getMessageParts(); + List outputParts = new ArrayList(); + + if (outputMessage != null) { + outputParts = outputMessage.getMessageParts(); + } boolean partFound = false; Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=572631&r1=572630&r2=572631&view=diff ============================================================================== --- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original) +++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Tue Sep 4 04:44:50 2007 @@ -665,4 +665,16 @@ assertEquals(msg.toString().trim(), e.getMessage().trim()); } } + + @Test + public void testParamterOrderNoOutputMessage() throws Exception { + try { + env.put(ToolConstants.CFG_WSDLURL, + getLocation("/wsdl2java_wsdl/bug967.wsdl")); + processor.setContext(env); + processor.execute(); + } catch (Exception e) { + fail("The cxf967.wsdl is a valid wsdl, should pass the test, caused by: " + e.getMessage()); + } + } } Added: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug967.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug967.wsdl?rev=572631&view=auto ============================================================================== --- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug967.wsdl (added) +++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug967.wsdl Tue Sep 4 04:44:50 2007 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +