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 2011/02/25 20:58:49 UTC
svn commit: r1074680 -
/tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
Author: antelder
Date: Fri Feb 25 19:58:49 2011
New Revision: 1074680
URL: http://svn.apache.org/viewvc?rev=1074680&view=rev
Log:
Correct validation of the Spring reference default bean attribute
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java?rev=1074680&r1=1074679&r2=1074680&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java Fri Feb 25 19:58:49 2011
@@ -728,14 +728,14 @@ public class SpringXMLComponentTypeLoade
Iterator<SpringSCAReferenceElement> itr = references.iterator();
while (itr.hasNext()) {
SpringSCAReferenceElement referenceElement = itr.next();
- boolean defaultBeanExists = true;
+ boolean defaultBeanExists = false;
boolean isUniqueReferenceName = true;
Iterator<SpringBeanElement> itb = beans.iterator();
while (itb.hasNext()) {
SpringBeanElement beanElement = itb.next();
if (referenceElement.getDefaultBean() != null)
if (referenceElement.getDefaultBean().equals(beanElement.getId()))
- defaultBeanExists = false;
+ defaultBeanExists = true;
if (referenceElement.getName().equals(beanElement.getId()))
isUniqueReferenceName = false;
}
@@ -745,7 +745,7 @@ public class SpringXMLComponentTypeLoade
if (referenceElement.getName().equals(propertyElement.getName()))
isUniqueReferenceName = false;
}
- if (!defaultBeanExists)
+ if (!defaultBeanExists && referenceElement.getDefaultBean() != null)
error(monitor, "DefaultBeanDoesNotExist", beans);
if (!isUniqueReferenceName)
error(monitor, "ScaReferenceNameNotUnique", beans);