diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-25 19:58:49 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-25 19:58:49 +0000 |
commit | 78b8dee58146d06b12b6aa7ecfa63dc024ebf099 (patch) | |
tree | 215ee23788da17ba442b3183937871427e88cf78 /sca-java-2.x/trunk/modules/implementation-spring/src | |
parent | 09f48367f8dbf16430f6b54ef616c90a8fe764ec (diff) |
Correct validation of the Spring reference default bean attribute
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1074680 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/implementation-spring/src')
-rw-r--r-- | sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java index 49d458ce1f..d575f8b49e 100644 --- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java +++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java @@ -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); |