Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 47719 invoked from network); 21 Jan 2009 17:52:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Jan 2009 17:52:46 -0000 Received: (qmail 62826 invoked by uid 500); 21 Jan 2009 17:52:46 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 62766 invoked by uid 500); 21 Jan 2009 17:52:45 -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 62757 invoked by uid 99); 21 Jan 2009 17:52:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jan 2009 09:52:45 -0800 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, 21 Jan 2009 17:52:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 03D462388875; Wed, 21 Jan 2009 09:52:14 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r736352 - in /cxf/trunk: rt/core/src/main/java/org/apache/cxf/wsdl11/ tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/ tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/ Date: Wed, 21 Jan 2009 17:52:13 -0000 To: commits@cxf.apache.org From: seanoc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090121175214.03D462388875@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seanoc Date: Wed Jan 21 09:52:13 2009 New Revision: 736352 URL: http://svn.apache.org/viewvc?rev=736352&view=rev Log: CXF-1969 wsdl2java - NPE when wsdl has a missing attribute Added: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/ cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=736352&r1=736351&r2=736352&view=diff ============================================================================== --- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original) +++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Wed Jan 21 09:52:13 2009 @@ -265,6 +265,14 @@ for (Port port : cast(serv.getPorts().values(), Port.class)) { Binding binding = port.getBinding(); PortType bindingPt = binding.getPortType(); + if (bindingPt == null) { + org.apache.cxf.common.i18n.Message msg = new + org.apache.cxf.common.i18n.Message("BINDING_MISSING_TYPE", + LOG, + binding.getQName()); + throw new WSDLRuntimeException(msg); + } + //TODO: wsdl4j's bug. if there is recursive import, //wsdl4j can not get operation input message PortType pt = def.getPortType(bindingPt.getQName()); Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=736352&r1=736351&r2=736352&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original) +++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Wed Jan 21 09:52:13 2009 @@ -40,11 +40,27 @@ import org.apache.cxf.tools.wsdlto.AbstractCodeGenTest; import org.apache.cxf.tools.wsdlto.WSDLToJava; import org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator; +import org.apache.cxf.wsdl11.WSDLRuntimeException; + import org.junit.Test; import org.mortbay.jetty.Server; import org.mortbay.jetty.handler.ResourceHandler; public class CodeGenBugTest extends AbstractCodeGenTest { + + + @Test + public void testCXF1969() throws Exception { + env.put(ToolConstants.CFG_WSDLURL, + getLocation("/wsdl2java_wsdl/cxf1969/report_incident.wsdl")); + processor.setContext(env); + + try { + processor.execute(); + } catch (WSDLRuntimeException wrex) { + assertEquals("BINDING_MISSING_TYPE", wrex.getMessage()); + } + } @Test // Test for CXF-1678 Added: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl?rev=736352&view=auto ============================================================================== --- cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl (added) +++ cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl Wed Jan 21 09:52:13 2009 @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +