svn commit: r1158598 - /tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java

[slaws]

Author: slaws
Date: Wed Aug 17 09:44:39 2011
New Revision: 1158598

URL: http://svn.apache.org/viewvc?rev=1158598&view=rev
Log:
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. 

Modified:
    
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java?rev=1158598&r1=1158597&r2=1158598&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
 Wed Aug 17 09:44:39 2011
@@ -417,6 +417,9 @@ public class EndpointReferenceBuilderImp
             //        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);