root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2016-08-25 00:10:06 +02:00
parent a7849b2861
commit 026473280b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
View File

@ -1009,12 +1009,12 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
} }
else if (candidateNames.length > 1) { else if (candidateNames.length > 1) {
Map<String, Object> candidates = new LinkedHashMap<String, Object>(candidateNames.length); Map<String, Object> candidates = new LinkedHashMap<String, Object>(candidateNames.length);
for (String candidateName : candidateNames) { for (String beanName : candidateNames) {
if (containsSingleton(candidateName)) { if (containsSingleton(beanName)) {
candidates.put(candidateName, getBean(candidateName, requiredType, args)); candidates.put(beanName, getBean(beanName, requiredType, args));
} }
else { else {
candidates.put(candidateName, getType(candidateName)); candidates.put(beanName, getType(beanName));
} }
} }
String candidateName = determinePrimaryCandidate(candidates, requiredType); String candidateName = determinePrimaryCandidate(candidates, requiredType);