Author: rfeng
Date: Wed Mar 21 21:49:52 2012
New Revision: 1303591
URL: http://svn.apache.org/viewvc?rev=1303591&view=rev
Log:
Revert the change based on the comment from
https://issues.apache.org/jira/browse/TUSCANY-4029
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java?rev=1303591&r1=1303590&r2=1303591&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
Wed Mar 21 21:49:52 2012
@@ -338,6 +338,11 @@ public class EndpointReferenceBinderImpl
}
+ // [rfeng] Setup the target endpoint if the reference uses an explicit
binding
+ if (endpointReference.getTargetEndpoint().getBinding() == null) {
+
endpointReference.getTargetEndpoint().setBinding(endpointReference.getBinding());
+ }
+
// Now the endpoint reference is resolved check that the binding
interfaces contract
// and the reference contract are compatible
try {
@@ -500,12 +505,16 @@ public class EndpointReferenceBinderImpl
} else {
endpointReference.setTargetEndpoint(matchedEndpoint);
Binding binding = matchedEndpoint.getBinding();
+ // Reverted the change, see
https://issues.apache.org/jira/browse/TUSCANY-4029
+ /*
try {
endpointReference.setBinding((Binding)
binding.clone());
} catch (CloneNotSupportedException e) {
// shouldn't happen
throw new RuntimeException(e);
}
+ */
+ endpointReference.setBinding(binding);
// TUSCANY-3873 - add policy from the service
// we don't care about intents at this stage
endpointReference.getPolicySets().addAll(matchedEndpoint.getPolicySets());
@@ -528,6 +537,7 @@ public class EndpointReferenceBinderImpl
endpointReference.setStatus(EndpointReference.Status.WIRED_TARGET_FOUND_AND_MATCHED);
endpointReference.setUnresolved(false);
}
+
}
private void build(EndpointReference endpointReference) {
