diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany')
2 files changed, 9 insertions, 4 deletions
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java index 4809241432..ce50c6223e 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java @@ -482,19 +482,22 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint if ((serviceContract != null) && (bindingContract != null)){ + + boolean bindingHasCallback = bindingContract.getCallbackInterface() != null; + try { if ((serviceContract.getClass() != bindingContract.getClass()) && (serviceContract instanceof JavaInterfaceContract)) { interfaceContractMapper.checkCompatibility(getGeneratedWSDLContract(serviceContract), bindingContract, Compatibility.SUBSET, - true, // we ignore callbacks as binding iface won't have one + !bindingHasCallback, // ignore callbacks if binding doesn't have one false); } else { interfaceContractMapper.checkCompatibility(serviceContract, bindingContract, Compatibility.SUBSET, - true, // we ignore callbacks as binding iface won't have one + !bindingHasCallback, // ignore callbacks if binding doesn't have one false); } } catch (Exception ex){ diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java index 531e4634e1..3873185e6b 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java @@ -325,6 +325,8 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen if ((referenceContract != null) && (bindingContract != null)){ + + boolean bindingHasCallback = bindingContract.getCallbackInterface() != null; try { @@ -333,13 +335,13 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen interfaceContractMapper.checkCompatibility(getGeneratedWSDLContract(referenceContract), bindingContract, Compatibility.SUBSET, - true, // we ignore callbacks as binding iface won't have one + !bindingHasCallback, // ignore callbacks if binding doesn't have one false); } else { interfaceContractMapper.checkCompatibility(referenceContract, bindingContract, Compatibility.SUBSET, - true, // we ignore callbacks as binding iface won't have one + !bindingHasCallback, // ignore callbacks if binding doesn't have one false); } |