Rationalize the interfaceContracts on Endpoint/EndpointReference

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

1 files changed, 5 insertions, 5 deletions

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
index efdbc71bbd..5b2de2f01f 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
@@ -276,8 +276,8 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen
             policyProvider.start();
         }
 
-        InterfaceContract bindingContract = getBindingInterfaceContract();
-        endpoint.setInterfaceContract(bindingContract);
+        // InterfaceContract bindingContract = getBindingInterfaceContract();
+        // endpoint.setInterfaceContract(bindingContract);
     }
 
 
@@ -441,12 +441,12 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen
             return bindingInterfaceContract;
         }
         bindingInterfaceContract = getBindingProvider().getBindingInterfaceContract();
-        if (bindingInterfaceContract == null && reference != null) {
-            bindingInterfaceContract = reference.getInterfaceContract();
-        }
         if (bindingInterfaceContract == null) {
             bindingInterfaceContract = getInterfaceContract();
         }
+        if (bindingInterfaceContract == null) {
+            bindingInterfaceContract = getReferenceInterfaceContract();
+        }
         return bindingInterfaceContract;
     }