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

jhoeller · jhoeller · commit ee8e178434e1 · 2012-10-12T16:24:52.000+02:00
Issue: SPR-9448
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -304,16 +304,16 @@ public String[] getBeanNamesForType(Class<?> type) {
 	}
 
 	public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
-		if (type == null || !allowEagerInit) {
-			return this.doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);
+		if (!isConfigurationFrozen()  || type == null || !allowEagerInit) {
+			return doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);
 		}
 		Map<Class<?>, String[]> cache = includeNonSingletons ?
 				this.nonSingletonBeanNamesByType : this.singletonBeanNamesByType;
 		String[] resolvedBeanNames = cache.get(type);
 		if (resolvedBeanNames != null) {
 			return resolvedBeanNames;
 		}
-		resolvedBeanNames = this.doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);
+		resolvedBeanNames = doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);
 		cache.put(type, resolvedBeanNames);
 		return resolvedBeanNames;
 	}

Original file line number	Diff line number	Diff line change
`@@ -304,16 +304,16 @@ public String[] getBeanNamesForType(Class<?> type) {`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {`
`307`		`- if (type == null \|\| !allowEagerInit) {`
`308`		`- return this.doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);`
	`307`	`+ if (!isConfigurationFrozen() \|\| type == null \|\| !allowEagerInit) {`
	`308`	`+ return doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);`
`309`	`309`	`}`
`310`	`310`	`Map<Class<?>, String[]> cache = includeNonSingletons ?`
`311`	`311`	`this.nonSingletonBeanNamesByType : this.singletonBeanNamesByType;`
`312`	`312`	`String[] resolvedBeanNames = cache.get(type);`
`313`	`313`	`if (resolvedBeanNames != null) {`
`314`	`314`	`return resolvedBeanNames;`
`315`	`315`	`}`
`316`		`- resolvedBeanNames = this.doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);`
	`316`	`+ resolvedBeanNames = doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);`
`317`	`317`	`cache.put(type, resolvedBeanNames);`
`318`	`318`	`return resolvedBeanNames;`
`319`	`319`	`}`