You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by bd...@apache.org on 2010/07/19 20:37:01 UTC
svn commit: r965579 -
/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
Author: bdaniel
Date: Mon Jul 19 18:37:01 2010
New Revision: 965579
URL: http://svn.apache.org/viewvc?rev=965579&view=rev
Log:
Ignore policy sets on a composite implementation when the using component has attached policies
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
Modified: tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java?rev=965579&r1=965578&r2=965579&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java Mon Jul 19 18:37:01 2010
@@ -196,6 +196,13 @@ public class CompositePolicyBuilderImpl
}
if (implementation instanceof Composite) {
+
+ // POL-4009 componentType attached policySets are ignored when policySets are
+ // attached to the using component definition.
+ if ( !component.getPolicySets().isEmpty() || !composite.getPolicySets().isEmpty() ) {
+ implementation.getPolicySets().clear();
+ }
+
inherit(implementation, Intent.Type.implementation, true, component, composite);
computePolicies((Composite)implementation, context);
expandDefaultIntents(implementation,context);