TUSCANY-3912 - Apply Greg's suggested change to clear component reference targets when nonOverrideable is false (overrideable = true which means that composite reference targets override any targets on the component reference that they promote. This change called for a change to otest 5023 which I added to the Tuscany compliance tests at r1158595. Thanks for working on this Greg.

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

1 files changed, 3 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
index c60a497bad..ada790163f 100644
--- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
+++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
@@ -417,6 +417,9 @@ public class EndpointReferenceBuilderImpl {
             //        autowire case. We need to think about if there is a more correct answer. 
             for (ComponentReference leafRef : leafComponentReferences){
                 int insertLocation = 0;
+                if (!leafRef.isNonOverridable()) {
+                    leafRef.getEndpointReferences().clear();
+                }                
                 for (EndpointReference epr : componentReference.getEndpointReferences()){
                     // copy the epr
                     EndpointReference eprCopy = copyHigherReference(epr, leafRef);