1 files changed, 13 insertions, 1 deletions
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
index 49960cf6e8..12767ed55c 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
@@ -159,7 +159,19 @@ public class IntentProcessor extends BaseStAXArtifactProcessor implements StAXAr
                                               intent.getName().toString());
                             }
                         }
-                        intent.getQualifiedIntents().add(qualified);
+                        
+                        // check that the qualifier is unique
+                        if ( !intent.getQualifiedIntents().contains(qualified)){
+                            intent.getQualifiedIntents().add(qualified);
+                        } else {
+                            Monitor.error(context.getMonitor(), 
+                                          this, 
+                                          Messages.RESOURCE_BUNDLE, 
+                                          "QualifierIsNotUnique", 
+                                          intent.getName().toString(),
+                                          qualifierName);
+                        }
+                        
                         qualified.setQualifiableIntent(intent);
                         current = qualified;
                     }