From 0f19a869e774fe18abf71710460bf4c9f785c41b Mon Sep 17 00:00:00 2001 From: scottkurz Date: Thu, 14 May 2009 23:01:24 +0000 Subject: Fix NPE bug in TUSCANY-2962 fix git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@774957 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java | 4 ++-- .../tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java index b54fa6b722..46803d37fb 100644 --- a/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java +++ b/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java @@ -427,11 +427,11 @@ public class WebServiceBindingProcessor implements StAXArtifactProcessor operations = portType.getOperations(); for (OperationImpl operation : operations) { - if (operation.getInput().getMessage() == null) { + if (operation.getInput() != null && operation.getInput().getMessage() == null) { ContributionResolveException ce = new ContributionResolveException("WSDL binding operation input name " + operation.getInput().getName() + " does not match with PortType Definition"); error("ContributionResolveException", wsdlDefinition, ce); } - if (operation.getOutput().getMessage() == null) { + if (operation.getOutput() != null && operation.getOutput().getMessage() == null) { ContributionResolveException ce = new ContributionResolveException("WSDL binding operation output name " + operation.getOutput().getName() + " does not match with PortType Definition"); error("ContributionResolveException", wsdlDefinition, ce); } diff --git a/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java index 3ad2da4205..11d6a913c2 100644 --- a/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java +++ b/branches/sca-java-1.x/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java @@ -259,11 +259,11 @@ public class WSDLInterfaceProcessor implements StAXArtifactProcessor operations = portType.getElement().getOperations(); for (OperationImpl operation : operations) { - if (operation.getInput().getMessage() == null) { + if (operation.getInput() != null && operation.getInput().getMessage() == null) { ContributionResolveException ce = new ContributionResolveException("WSDL binding operation input name " + operation.getInput().getName() + " does not match with PortType Definition"); error("ContributionResolveException", wsdlDefinition, ce); } - if (operation.getOutput().getMessage() == null) { + if (operation.getOutput() != null && operation.getOutput().getMessage() == null) { ContributionResolveException ce = new ContributionResolveException("WSDL binding operation output name " + operation.getOutput().getName() + " does not match with PortType Definition"); error("ContributionResolveException", wsdlDefinition, ce); } -- cgit v1.2.3