Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #667 from luckybomb/spr12356

Browse Source 
* spr12356:
  Better use of key iterator
This commit is contained in:
Stephane Nicoll
2014-10-21 17:24:13 +02:00
parent 66069333f1 2e5d752e15
commit 4d3ade563a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java
View File

@@ -79,13 +79,14 @@ public class BeanFactoryAnnotationUtils {
private static <T> T qualifiedBeanOfType(ConfigurableListableBeanFactory bf, Class<T> beanType, String qualifier) {
Map<String, T> candidateBeans = BeanFactoryUtils.beansOfTypeIncludingAncestors(bf, beanType);
T matchingBean = null;
for (String beanName : candidateBeans.keySet()) {
for (Map.Entry<String, T> entry : candidateBeans.entrySet()) {
String beanName = entry.getKey();
if (isQualifierMatch(qualifier, beanName, bf)) {
if (matchingBean != null) {
throw new NoSuchBeanDefinitionException(qualifier, "No unique " + beanType.getSimpleName() +
" bean found for qualifier '" + qualifier + "'");
}
matchingBean = candidateBeans.get(beanName);
matchingBean = entry.getValue();
}
}
if (matchingBean != null) {