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

1 files changed, 4 insertions, 4 deletions

diff --git a/branches/sca-java-1.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/branches/sca-java-1.4/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.4/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/branches/sca-java-1.4/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);