TUSCANY-3195: merge fix from 1.x to 1.5.1 for Inherently-provided intents do not work at operation level

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

1 files changed, 1 insertions, 11 deletions

diff --git a/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java b/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
index c0bc18dfaf..5061ac6bac 100644
--- a/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
+++ b/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
@@ -156,17 +156,7 @@ abstract class PolicyConfigurationUtil {
             //remove duplicates and ...

             //where qualified form of intent exists retain it and remove the qualifiable intent

             filterDuplicatesAndQualifiableIntents(confOp);

-            

-            //exclude intents that are inherently supported by the parent

-            //attachpoint-type (binding-type  / implementation-type)

-            if ( attachPointType != null ) {

-                List<Intent> requiredIntents = new ArrayList<Intent>(confOp.getRequiredIntents());

-                for ( Intent intent : requiredIntents ) {

-                    if ( isProvidedInherently(attachPointType, intent) ) {

-                        confOp.getRequiredIntents().remove(intent);

-                    }

-                }

-            }

+

         }

     }