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

DefaultListableBeanFactory skips resolvableDependencies check for null value

Browse Source 
Issue: SPR-13599
This commit is contained in:
Juergen Hoeller
2015-10-26 22:45:36 +01:00
parent 8c4b8d253a
commit 5386e8a9e9
2 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1225,7 +1225,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
for (Map.Entry<String, Object> entry : candidateBeans.entrySet()) {
String candidateBeanName = entry.getKey();
Object beanInstance = entry.getValue();
if (this.resolvableDependencies.values().contains(beanInstance) ||
if ((beanInstance != null && this.resolvableDependencies.containsValue(beanInstance)) ||
matchesBeanName(candidateBeanName, descriptor.getDependencyName())) {
return candidateBeanName;
}