Merge branch '6.2.x'
This commit is contained in:
@@ -177,7 +177,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
|
|||||||
/** Map from bean name to merged BeanDefinitionHolder. */
|
/** Map from bean name to merged BeanDefinitionHolder. */
|
||||||
private final Map<String, BeanDefinitionHolder> mergedBeanDefinitionHolders = new ConcurrentHashMap<>(256);
|
private final Map<String, BeanDefinitionHolder> mergedBeanDefinitionHolders = new ConcurrentHashMap<>(256);
|
||||||
|
|
||||||
// Set of bean definition names with a primary marker. */
|
/** Set of bean definition names with a primary marker. */
|
||||||
private final Set<String> primaryBeanNames = ConcurrentHashMap.newKeySet(16);
|
private final Set<String> primaryBeanNames = ConcurrentHashMap.newKeySet(16);
|
||||||
|
|
||||||
/** Map of singleton and non-singleton bean names, keyed by dependency type. */
|
/** Map of singleton and non-singleton bean names, keyed by dependency type. */
|
||||||
|
|||||||
Reference in New Issue
Block a user