diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-05 22:35:54 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-05 22:35:54 +0000 |
commit | 1d3d3a169cac2f0d41ea86d058b0dba1b1d07142 (patch) | |
tree | f7dab89282b3095f11a833cd66cbdffb10d2fc1d /branches/sca-java-1.4/modules/interface-wsdl-xml | |
parent | 6bfd044be37a044a19da7a93da3905d0aa2353a2 (diff) |
Merge r723501 changes for TUSCANY-2698 into the 1.4 branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723908 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.4/modules/interface-wsdl-xml')
-rw-r--r-- | branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java index 14f7d4ff5c..be80606343 100644 --- a/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java +++ b/branches/sca-java-1.4/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java @@ -201,8 +201,14 @@ public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfa WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition(); wsdlDefinition.setUnresolved(true); wsdlDefinition.setNamespace(wsdlInterface.getName().getNamespaceURI()); - WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, wsdlDefinition); - if (!resolved.isUnresolved()) { + WSDLDefinition resolved = null; + try { + resolved = resolver.resolveModel(WSDLDefinition.class, wsdlDefinition); + } catch (ContributionRuntimeException e) { + ContributionResolveException ce = new ContributionResolveException(e.getCause()); + error("ContributionResolveException", wsdlDefinition, ce); + } + if (resolved != null && !resolved.isUnresolved()) { wsdlDefinition.setDefinition(resolved.getDefinition()); wsdlDefinition.setLocation(resolved.getLocation()); wsdlDefinition.setURI(resolved.getURI()); |