archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct validation of the Spring reference default bean attribute

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1074680 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
antelder 2011-02-25 19:58:49 +00:00
commit 78b8dee581
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
View file

@ -728,14 +728,14 @@ public class SpringXMLComponentTypeLoader {
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 SpringXMLComponentTypeLoader {
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);