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

1 files changed, 6 insertions, 2 deletions

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<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);