svn commit: r791989 - /tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java

[rfeng]

Author: rfeng
Date: Tue Jul  7 21:59:44 2009
New Revision: 791989

URL: http://svn.apache.org/viewvc?rev=791989&view=rev
Log:
Test if the excluded intents is declared but not resolved

Modified:
    
tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java

Modified: 
tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java?rev=791989&r1=791988&r2=791989&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
 (original)
+++ 
tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
 Tue Jul  7 21:59:44 2009
@@ -363,7 +363,7 @@
             for (Intent excludedIntent : policyIntent.getExcludedIntents()) {
                 if (excludedIntent.isUnresolved()) {
                     Intent resolvedExcludedIntent = 
resolver.resolveModel(Intent.class, excludedIntent);
-                    if (!resolvedExcludedIntent.isUnresolved()) {
+                    if (!resolvedExcludedIntent.isUnresolved() || 
resolvedExcludedIntent != excludedIntent) {
                         excludedIntents.add(resolvedExcludedIntent);
                     } else {
                         error("ExcludedIntentNotFound", resolver, 
excludedIntent, policyIntent);