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

Avoid canonicalName call for already-seen bean name 

Issue: SPR-14433
(cherry picked from commit 5890758)
This commit is contained in:
Juergen Hoeller 2016-07-06 15:12:18 +02:00
parent 11cb109114
commit 52065a736b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -449,10 +449,10 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
} }
private boolean isDependent(String beanName, String dependentBeanName, Set<String> alreadySeen) { private boolean isDependent(String beanName, String dependentBeanName, Set<String> alreadySeen) {
String canonicalName = canonicalName(beanName);
if (alreadySeen != null && alreadySeen.contains(beanName)) { if (alreadySeen != null && alreadySeen.contains(beanName)) {
return false; return false;
} }
String canonicalName = canonicalName(beanName);
Set<String> dependentBeans = this.dependentBeanMap.get(canonicalName); Set<String> dependentBeans = this.dependentBeanMap.get(canonicalName);
if (dependentBeans == null) { if (dependentBeans == null) {
return false; return false;