1 files changed, 28 insertions, 0 deletions
diff --git a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
index 8ba5e98f68..76d5a850d1 100644
--- a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
+++ b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
@@ -310,6 +310,17 @@ public class ComponentBuilderImpl {
                               component.getName(), 
                               componentProperty.getName());
             }
+            
+            // check that not too many values are supplied
+            if (!componentProperty.isMany() && isPropertyManyValued(componentProperty)){
+                Monitor.error(monitor, 
+                              this, 
+                              Messages.ASSEMBLY_VALIDATION, 
+                              "PropertyHasManyValues", 
+                              component.getName(), 
+                              componentProperty.getName());                
+            }
+            
         }
     }
 
@@ -1003,6 +1014,23 @@ public class ComponentBuilderImpl {
 
         return true;
     }
+    
+    /**
+     * Look to see is a property has more than one value
+     * 
+     * @param property
+     * @return true is the property has more than one value
+     */
+    private boolean isPropertyManyValued(Property property) {
+        
+        if (isPropertyValueSet(property)){
+            Document value = (Document)property.getValue();
+            if (value.getFirstChild().getChildNodes().getLength() > 1){
+                return true;
+            }
+        }
+        return false;
+    }
 
     private boolean isValidMultiplicityOverride(Multiplicity definedMul, Multiplicity overridenMul) {
         if (definedMul != overridenMul) {