Fix multiple concurrency related issues

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

1 files changed, 7 insertions, 6 deletions

diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
index 5db05a2cc7..296677d8b8 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
@@ -327,12 +327,13 @@ public class IntentProcessor extends BaseStAXArtifactProcessor implements StAXAr
     }
 
     public void resolve(Intent intent, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
-        Monitor monitor = context.getMonitor();
-        resolveProfileIntent(intent, resolver, context);
-        resolveExcludedIntents(intent, resolver, context);
-        resolveQualifiedIntent(intent, resolver, context);
-        resolveContrainedTypes(intent, resolver, context);
-        intent.setUnresolved(false);
+        if (intent != null && intent.isUnresolved()) {
+            resolveProfileIntent(intent, resolver, context);
+            resolveExcludedIntents(intent, resolver, context);
+            resolveQualifiedIntent(intent, resolver, context);
+            resolveContrainedTypes(intent, resolver, context);
+            intent.setUnresolved(false);
+        }
     }
 
     public QName getArtifactType() {