diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-05 00:03:14 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-05 00:03:14 +0000 |
commit | bb2aadc32654a0e70ab209cb3cbcecdc768068b9 (patch) | |
tree | 41637e3f3a4a3efeaded273a43847c6dfdbe331e /branches/sca-java-1.x/modules/binding-ws-xml/src/main | |
parent | d15ee677eeba5b76444202ed18862faa19296d63 (diff) |
Add validation test case and further updates for TUSCANY-2698
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723501 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/binding-ws-xml/src/main')
-rw-r--r-- | branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java | 8 |
1 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 860daa647d..980003ddf1 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 @@ -343,10 +343,10 @@ public class WebServiceBindingProcessor implements StAXArtifactProcessor<WebServ } catch (ContributionRuntimeException e) { ContributionResolveException ce = new ContributionResolveException(e.getCause()); error("ContributionResolveException", wsdlDefinition, ce); - throw ce; + //throw ce; } - if (!resolved.isUnresolved()) { + if (resolved != null && !resolved.isUnresolved()) { wsdlDefinition.setDefinition(resolved.getDefinition()); wsdlDefinition.setLocation(resolved.getLocation()); wsdlDefinition.setURI(resolved.getURI()); @@ -388,11 +388,11 @@ public class WebServiceBindingProcessor implements StAXArtifactProcessor<WebServ WSDLInterface wsdlInterface = null; try { wsdlInterface = wsdlFactory.createWSDLInterface(portType, wsdlDefinition, resolver); + interfaceContract.setInterface(wsdlInterface); + model.setBindingInterfaceContract(interfaceContract); } catch (InvalidInterfaceException e) { warning("InvalidInterfaceException", wsdlFactory, model.getName()); } - interfaceContract.setInterface(wsdlInterface); - model.setBindingInterfaceContract(interfaceContract); } } policyProcessor.resolvePolicies(model, resolver); |