svn commit: r675061 - /tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java

[lresende]

Author: lresende
Date: Tue Jul  8 16:56:13 2008
New Revision: 675061

URL: http://svn.apache.org/viewvc?rev=675061&view=rev
Log:
TUSCANY-2466 - Only apply resolve algorithm to unresolved policies

Modified:
    
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java

Modified: 
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java?rev=675061&r1=675060&r2=675061&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
 (original)
+++ 
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
 Tue Jul  8 16:56:13 2008
@@ -740,8 +740,12 @@
         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);