summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
authorbdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68>2010-07-22 15:23:56 +0000
committerbdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68>2010-07-22 15:23:56 +0000
commitd0a63dd5b9c0f7134e3b62bc0284fd173b879692 (patch)
treeaa876551687c862d36e88a8473fd7116384dfce8 /sca-java-2.x/trunk
parent6363cdfc867330de5881fc85476c9ff13baa5259 (diff)
intents and policySets specified on implementation.composite elements were being lost
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@966706 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 8922c232b0..c2deacbb35 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
@@ -1098,8 +1098,17 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
//now resolve the implementation so that even if there is a shared instance
//for this that is resolved, the specified intents and policysets are safe in the
//component and not lost
+ List<Intent> intents = implementation.getRequiredIntents();
+ List<PolicySet> policySets = implementation.getPolicySets();
+
+
implementation = resolveImplementation(implementation, resolver, context);
+ implementation.getPolicySets().clear();
+ implementation.getPolicySets().addAll(policySets);
+ implementation.getRequiredIntents().clear();
+ implementation.getRequiredIntents().addAll(intents);
+
component.setImplementation(implementation);
}