diff options
Diffstat (limited to 'java/sca/modules/core')
3 files changed, 7 insertions, 8 deletions
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java index a44e4a93b7..3dafaedf35 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java @@ -521,7 +521,7 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint } bindingInterfaceContract = getBindingProvider().getBindingInterfaceContract(); if (bindingInterfaceContract == null) { - bindingInterfaceContract = getInterfaceContract(); + bindingInterfaceContract = getComponentServiceInterfaceContract(); } if (bindingInterfaceContract == null) { bindingInterfaceContract = getComponentTypeServiceInterfaceContract(); @@ -535,11 +535,11 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint return serviceInterfaceContract; } if (service == null) { - return getInterfaceContract(); + return getComponentServiceInterfaceContract(); } serviceInterfaceContract = getLeafContract(service).getInterfaceContract(); if (serviceInterfaceContract == null) { - serviceInterfaceContract = getInterfaceContract(); + serviceInterfaceContract = getComponentServiceInterfaceContract(); } return serviceInterfaceContract; } 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 fe343e941d..fa61ff8721 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 @@ -465,7 +465,7 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen } bindingInterfaceContract = getBindingProvider().getBindingInterfaceContract(); if (bindingInterfaceContract == null) { - bindingInterfaceContract = getInterfaceContract(); + bindingInterfaceContract = getComponentReferenceInterfaceContract(); } if (bindingInterfaceContract == null) { bindingInterfaceContract = getComponentTypeReferenceInterfaceContract(); @@ -479,11 +479,11 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen return referenceInterfaceContract; } if (reference == null) { - return getInterfaceContract(); + return getComponentReferenceInterfaceContract(); } referenceInterfaceContract = getLeafContract(reference).getInterfaceContract(); if (referenceInterfaceContract == null) { - referenceInterfaceContract = getInterfaceContract(); + referenceInterfaceContract = getComponentReferenceInterfaceContract(); } return referenceInterfaceContract; } diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java index 115a4d31dd..1b6cf79645 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java @@ -305,7 +305,7 @@ public class ComponentContextImpl implements RuntimeComponentContext { RuntimeEndpoint endpoint) { try { if (businessInterface == null) { - InterfaceContract contract = endpoint.getInterfaceContract(); + InterfaceContract contract = endpoint.getComponentTypeServiceInterfaceContract(); businessInterface = (Class<B>)((JavaInterface)contract.getInterface()).getJavaClass(); } RuntimeEndpointReference ref = @@ -369,7 +369,6 @@ public class ComponentContextImpl implements RuntimeComponentContext { endpointReference.setReference(componentReference); endpointReference.setBinding(endpoint.getBinding()); endpointReference.setUnresolved(false); - endpointReference.setInterfaceContract(interfaceContract); endpointReference.setStatus(EndpointReference.WIRED_TARGET_FOUND_READY_FOR_MATCHING); endpointReference.setTargetEndpoint(endpoint); |