You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tuscany.apache.org by an...@apache.org on 2009/08/19 17:09:50 UTC

svn commit: r805831 - /tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java

Author: antelder
Date: Wed Aug 19 15:09:49 2009
New Revision: 805831

URL: http://svn.apache.org/viewvc?rev=805831&view=rev
Log:
Fix OASIS test ASM_5012 - its ok to override a reference with multiplicity of zero-N with one-one or one-N

Modified:
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java

Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java?rev=805831&r1=805830&r2=805831&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java Wed Aug 19 15:09:49 2009
@@ -66,7 +66,7 @@
         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: