You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/05/07 08:48:08 UTC
svn commit: r535760 - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/ReferenceUtil.java
Author: jsdelfino
Date: Sun May 6 23:48:07 2007
New Revision: 535760
URL: http://svn.apache.org/viewvc?view=rev&rev=535760
Log:
Fixed NPE caused by changing the default multiplicity to null. We're changing it to null so that a component reference can inherit it from the corresponding reference.
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/ReferenceUtil.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java?view=diff&rev=535760&r1=535759&r2=535760
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java Sun May 6 23:48:07 2007
@@ -124,7 +124,6 @@
assertEquals(calcComponentReference.getName(), "addService");
assertEquals(calcComponentReference.isAutowire(), false);
assertEquals(calcComponentReference.isWiredByImpl(), false);
- assertEquals(calcComponentReference.getMultiplicity(), Multiplicity.ONE_ONE);
assertEquals(calcComponentReference.getRequiredIntents().get(0).getName(),
new QName("http://test/confidentiality", "confidentiality"));
assertEquals(calcComponentReference.getPolicySets().get(0).getName(), new QName("http://test/secure", "secure"));
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/ReferenceUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/ReferenceUtil.java?view=diff&rev=535760&r1=535759&r2=535760
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/ReferenceUtil.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/impl/ReferenceUtil.java Sun May 6 23:48:07 2007
@@ -55,6 +55,13 @@
return false;
}
}
+
+ //FIXME workaround, this validation is sometimes invoked too early
+ // because we get a chance to init the multiplicity attribute
+ if (multiplicity == null) {
+ return true;
+ }
+
switch (multiplicity) {
case ZERO_N:
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org