From 026473280b5ece9c8d6b5807f930c43989a5ca8d Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 25 Aug 2016 00:10:06 +0200 Subject: [PATCH] Polishing --- .../beans/factory/support/DefaultListableBeanFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index fad8a3956d..4c5ca7c496 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -1009,12 +1009,12 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto } else if (candidateNames.length > 1) { Map candidates = new LinkedHashMap(candidateNames.length); - for (String candidateName : candidateNames) { - if (containsSingleton(candidateName)) { - candidates.put(candidateName, getBean(candidateName, requiredType, args)); + for (String beanName : candidateNames) { + if (containsSingleton(beanName)) { + candidates.put(beanName, getBean(beanName, requiredType, args)); } else { - candidates.put(candidateName, getType(candidateName)); + candidates.put(beanName, getType(beanName)); } } String candidateName = determinePrimaryCandidate(candidates, requiredType);