Ensure that fully resolved JSR250 policy sets, added by the policy processor on the fly, are not re-resolved. Hence the dynamic information in the policy sets is not lost.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1195401 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 6 deletions

diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
index 9e6c4d758d..238a745429 100644
--- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
+++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
@@ -443,16 +443,24 @@ public class ComponentPolicyBuilderImpl {
         //                or external attachement
         // resolve policy set names that have been specified for the
         // policy subject against the real policy sets from the 
-        // definitions files
+        // definitions files. 
+        // Some policy plugins, e.g. JSR250, add resolved policy sets
+        // on the fly as they read details from annotations. So check 
+        // that policy sets are unresolved befor blowing them away with 
+        // a warning
         Set<PolicySet> policySets = new HashSet<PolicySet>();
         if (definitions != null) {
             for (PolicySet policySet : subject.getPolicySets()) {
-                int index = definitions.getPolicySets().indexOf(policySet);
-                if (index != -1) {
-                    policySets.add(definitions.getPolicySets().get(index));
+                if (policySet.isUnresolved()){
+                    int index = definitions.getPolicySets().indexOf(policySet);
+                    if (index != -1) {
+                        policySets.add(definitions.getPolicySets().get(index));
+                    } else {
+                        // PolicySet cannot be resolved
+                        warning(context.getMonitor(), "PolicySetNotFoundAtBuild", subject, policySet);
+                    }
                 } else {
-                    // PolicySet cannot be resolved
-                    warning(context.getMonitor(), "PolicySetNotFoundAtBuild", subject, policySet);
+                    policySets.add(policySet);
                 }
             }
         }