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

Only cache by-type lookups if configuration has been marked as frozen 

Issue: SPR-9448
This commit is contained in:
Juergen Hoeller 2012-10-12 16:25:11 +02:00 committed by unknown
parent 3c59725b94
commit 538ce4747d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,8 +304,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
} }
public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) { public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
if (type == null || !allowEagerInit) { if (!isConfigurationFrozen() || type == null || !allowEagerInit) {
return this.doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit); return doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);
} }
Map<Class<?>, String[]> cache = includeNonSingletons ? Map<Class<?>, String[]> cache = includeNonSingletons ?
this.nonSingletonBeanNamesByType : this.singletonBeanNamesByType; this.nonSingletonBeanNamesByType : this.singletonBeanNamesByType;
@ -313,7 +313,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
if (resolvedBeanNames != null) { if (resolvedBeanNames != null) {
return resolvedBeanNames; return resolvedBeanNames;
} }
resolvedBeanNames = this.doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit); resolvedBeanNames = doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);
cache.put(type, resolvedBeanNames); cache.put(type, resolvedBeanNames);
return resolvedBeanNames; return resolvedBeanNames;
} }