Return-Path: Delivered-To: apmail-ode-commits-archive@www.apache.org Received: (qmail 93669 invoked from network); 15 Oct 2007 14:12:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Oct 2007 14:12:25 -0000 Received: (qmail 91481 invoked by uid 500); 15 Oct 2007 14:12:13 -0000 Delivered-To: apmail-ode-commits-archive@ode.apache.org Received: (qmail 91451 invoked by uid 500); 15 Oct 2007 14:12:12 -0000 Mailing-List: contact commits-help@ode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ode.apache.org Delivered-To: mailing list commits@ode.apache.org Received: (qmail 91442 invoked by uid 99); 15 Oct 2007 14:12:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Oct 2007 07:12:12 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Mon, 15 Oct 2007 14:12:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1A4B81A9832; Mon, 15 Oct 2007 07:11:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r584793 - in /ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2: hooks/ODEAxisService.java util/SoapMessageConverter.java Date: Mon, 15 Oct 2007 14:11:33 -0000 To: commits@ode.apache.org From: mriou@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071015141134.1A4B81A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mriou Date: Mon Oct 15 07:11:33 2007 New Revision: 584793 URL: http://svn.apache.org/viewvc?rev=584793&view=rev Log: Potential NPE when building a SOAP fault. Modified: ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java Modified: ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java?rev=584793&r1=584792&r2=584793&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java (original) +++ ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java Mon Oct 15 07:11:33 2007 @@ -25,11 +25,7 @@ import java.util.Iterator; import java.util.List; -import javax.wsdl.Definition; -import javax.wsdl.Operation; -import javax.wsdl.Part; -import javax.wsdl.Port; -import javax.wsdl.Service; +import javax.wsdl.*; import javax.wsdl.extensions.soap.SOAPAddress; import javax.xml.namespace.QName; @@ -101,6 +97,23 @@ public static AxisService createService(AxisConfiguration axisConfig, QName serviceQName, String port, String axisName, Definition wsdlDef, MessageReceiver receiver) throws AxisFault { + for (Object binding : wsdlDef.getAllBindings().values()) { + for (Object bindOp : ((Binding) binding).getBindingOperations()) { + System.out.println("Bind Op " + ((BindingOperation) bindOp).getName()); + for (Object bindFault : ((BindingOperation) bindOp).getBindingFaults().values()) { + System.out.println("Bind fault " + ((BindingFault)bindFault).getName()); + } + } + } + + for (Object pts : wsdlDef.getAllPortTypes().values()) { + for (Object op : ((PortType) pts).getOperations()) { + for (Object fault : ((Operation) op).getFaults().values()) { + System.out.println("Op Fault " + ((Fault)fault).getName()); + } + } + } + WSDL11ToAxisServiceBuilder serviceBuilder = new WSDL11ToAxisServiceBuilder(wsdlDef, serviceQName, port); AxisService axisService = serviceBuilder.populateService(); axisService.setName(axisName); Modified: ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java?rev=584793&r1=584792&r2=584793&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java (original) +++ ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java Mon Oct 15 07:11:33 2007 @@ -264,7 +264,8 @@ SOAPFaultReason reason = _soapFactory.createSOAPFaultReason(fault); reason.setText(faultName); SOAPFaultDetail soapDetail = _soapFactory.createSOAPFaultDetail(fault); - soapDetail.addDetailEntry(detail.getFirstElement()); + if (detail != null) + soapDetail.addDetailEntry(detail.getFirstElement()); return fault; }