summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2008-07-08 23:56:13 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2008-07-08 23:56:13 +0000
commit680e89a0e847c88a5854793fa0cd7c0b6ffa6ad5 (patch)
tree1044bd55403be130e04809152d07af3edc72f191 /java
parent4ea7292c9623b7efdd1ad14f82fadd03e8d62d5e (diff)
TUSCANY-2466 - Only apply resolve algorithm to unresolved policies
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@675061 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index 6637bd87c8..ae33a4da16 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
@@ -740,8 +740,12 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor implement
List<PolicySet> resolvedPolicySets = new ArrayList<PolicySet>();
PolicySet resolvedPolicySet = null;
for (PolicySet policySet : policySets) {
- resolvedPolicySet = resolver.resolveModel(PolicySet.class, policySet);
- resolvedPolicySets.add(resolvedPolicySet);
+ if (policySet.isUnresolved()) {
+ resolvedPolicySet = resolver.resolveModel(PolicySet.class, policySet);
+ resolvedPolicySets.add(resolvedPolicySet);
+ } else {
+ resolvedPolicySets.add(policySet);
+ }
}
policySets.clear();
policySets.addAll(resolvedPolicySets);