From c36c69927b965a0ed63037a476a3ba16ac565e80 Mon Sep 17 00:00:00 2001 From: lresende Date: Tue, 8 Jul 2008 23:58:47 +0000 Subject: TUSCANY-2466 - Merging changes from trunk to only apply resolve algorithm to unresolved policies git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@675063 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'branches/sca-java-1.3/modules/assembly-xml') diff --git a/branches/sca-java-1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/branches/sca-java-1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java index 6637bd87c8..ae33a4da16 100644 --- a/branches/sca-java-1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java +++ b/branches/sca-java-1.3/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 resolvedPolicySets = new ArrayList(); 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); -- cgit v1.2.3