summaryrefslogtreecommitdiffstats
path: root/java/sca
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-08-19 15:09:49 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-08-19 15:09:49 +0000
commit5cb9df5238eee241c5dd05a1da08d11d1a05606b (patch)
tree9fb6e22cd1a758fb3430cbffae4e4ec7c50a2823 /java/sca
parent21d52f1baa9e57a73b9131ef88bd334ab5d67279 (diff)
Fix OASIS test ASM_5012 - its ok to override a reference with multiplicity of zero-N with one-one or one-N
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@805831 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca')
-rw-r--r--java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
index 8f2c5be5dc..3d34efa6d9 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
@@ -66,7 +66,7 @@ abstract class ReferenceConfigurationUtil {
if (definedMul != overridenMul) {
switch (definedMul) {
case ZERO_N:
- return overridenMul == Multiplicity.ZERO_ONE;
+ return overridenMul == Multiplicity.ZERO_ONE || overridenMul == Multiplicity.ONE_ONE || overridenMul == Multiplicity.ONE_N;
case ONE_N:
return overridenMul == Multiplicity.ONE_ONE;
case ZERO_ONE: