Fix NPEs in RuntimeWireImpl2 when implementation.web in one node is wired to a service in another node

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@782798 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 0 deletions

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java
index 3911d6dd49..ab03645182 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl2.java
@@ -315,6 +315,9 @@ public class RuntimeWireImpl2 implements RuntimeWire {
     
     private InterfaceContract getInterfaceContract(ComponentReference reference, Binding binding) {
         InterfaceContract interfaceContract = reference.getInterfaceContract();
+        if (interfaceContract == null) {
+            interfaceContract = endpoint.getInterfaceContract();
+        }
         ReferenceBindingProvider provider = ((RuntimeComponentReference)reference).getBindingProvider(binding);
         if (provider != null) {
             InterfaceContract bindingContract = provider.getBindingInterfaceContract();
@@ -419,6 +422,8 @@ public class RuntimeWireImpl2 implements RuntimeWire {
     public EndpointReference getTarget() {
         // TODO - EPR convert this into method that returns Endpoint2
         
+        Endpoint2 endpoint = this.endpoint != null ? this.endpoint : endpointReference.getTargetEndpoint();
+
         // convert the target info into old endpoint reference format
         EndpointReference epr = new EndpointReferenceImpl((RuntimeComponent)endpoint.getComponent(),
                                                            endpoint.getService(),