Reduce memory on RBD merge

philwebb · philwebb · commit 8dbd409c6cdd · 2013-05-02T10:35:00.000-07:00
** Probably not for Spring 4 M1 **
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -169,7 +169,6 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	private final ThreadLocal<Object> prototypesCurrentlyInCreation =
 			new NamedThreadLocal<Object>("Prototype beans currently in creation");
 
-
 	/**
 	 * Create a new AbstractBeanFactory.
 	 */
@@ -398,7 +397,7 @@ else if (containsSingleton(beanName)) {
 				return parentBeanFactory.isSingleton(originalBeanName(name));
 			}
 
-			RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
+			RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName, true);
 
 			// In case of FactoryBean, return singleton status of created object if not a dereference.
 			if (mbd.isSingleton()) {
@@ -428,7 +427,7 @@ public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
 			return parentBeanFactory.isPrototype(originalBeanName(name));
 		}
 
-		RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
+		RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName, true);
 		if (mbd.isPrototype()) {
 			// In case of FactoryBean, return singleton status of created object if not a dereference.
 			return (!BeanFactoryUtils.isFactoryDereference(name) || isFactoryBean(beanName, mbd));
@@ -495,7 +494,7 @@ else if (containsSingleton(beanName) && !containsBeanDefinition(beanName)) {
 			}
 
 			// Retrieve corresponding bean definition.
-			RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
+			RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName, true);
 
 			Class[] typesToMatch = (FactoryBean.class.equals(typeToMatch) ?
 					new Class[] {typeToMatch} : new Class[] {FactoryBean.class, typeToMatch});
@@ -560,13 +559,13 @@ else if (containsSingleton(beanName) && !containsBeanDefinition(beanName)) {
 				return parentBeanFactory.getType(originalBeanName(name));
 			}
 
-			RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
+			RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName, true);
 
 			// Check decorated bean definition, if any: We assume it'll be easier
 			// to determine the decorated bean's type than the proxy's type.
 			BeanDefinitionHolder dbd = mbd.getDecoratedDefinition();
 			if (dbd != null && !BeanFactoryUtils.isFactoryDereference(name)) {
-				RootBeanDefinition tbd = getMergedBeanDefinition(dbd.getBeanName(), dbd.getBeanDefinition(), mbd);
+				RootBeanDefinition tbd = getMergedBeanDefinition(dbd.getBeanName(), dbd.getBeanDefinition(), mbd, true);
 				Class<?> targetClass = predictBeanType(dbd.getBeanName(), tbd);
 				if (targetClass != null && !FactoryBean.class.isAssignableFrom(targetClass)) {
 					return targetClass;
@@ -901,7 +900,7 @@ else if (containsSingleton(beanName)) {
 			return ((ConfigurableBeanFactory) getParentBeanFactory()).isFactoryBean(name);
 		}
 
-		return isFactoryBean(beanName, getMergedLocalBeanDefinition(beanName));
+		return isFactoryBean(beanName, getMergedLocalBeanDefinition(beanName, true));
 	}
 
 	@Override
@@ -1094,12 +1093,17 @@ protected void registerCustomEditors(PropertyEditorRegistry registry) {
 	 * @throws BeanDefinitionStoreException in case of an invalid bean definition
 	 */
 	protected RootBeanDefinition getMergedLocalBeanDefinition(String beanName) throws BeansException {
+		return getMergedLocalBeanDefinition(beanName, false);
+	}
+
+	protected RootBeanDefinition getMergedLocalBeanDefinition(String beanName,
+			boolean forReadOnly) throws BeansException {
 		// Quick check on the concurrent map first, with minimal locking.
 		RootBeanDefinition mbd = this.mergedBeanDefinitions.get(beanName);
 		if (mbd != null) {
 			return mbd;
 		}
-		return getMergedBeanDefinition(beanName, getBeanDefinition(beanName));
+		return getMergedBeanDefinition(beanName, getBeanDefinition(beanName), null, forReadOnly);
 	}
 
 	/**
@@ -1129,6 +1133,27 @@ protected RootBeanDefinition getMergedBeanDefinition(String beanName, BeanDefini
 	protected RootBeanDefinition getMergedBeanDefinition(
 			String beanName, BeanDefinition bd, BeanDefinition containingBd)
 			throws BeanDefinitionStoreException {
+		return getMergedBeanDefinition(beanName, bd, containingBd, false);
+	}
+
+	/**
+	 * Return a RootBeanDefinition for the given bean, by merging with the
+	 * parent if the given bean's definition is a child bean definition.
+	 * @param beanName the name of the bean definition
+	 * @param bd the original bean definition (Root/ChildBeanDefinition)
+	 * @param containingBd the containing bean definition in case of inner bean,
+	 * or {@code null} in case of a top-level bean
+	 * @return a (potentially merged) RootBeanDefinition for the given bean
+	 * @throws BeanDefinitionStoreException in case of an invalid bean definition
+	 */
+	protected RootBeanDefinition getMergedBeanDefinition(
+			String beanName, BeanDefinition bd, BeanDefinition containingBd,
+			boolean forReadOnly)
+			throws BeanDefinitionStoreException {
+
+		if(forReadOnly && bd.getParentName() == null && bd instanceof RootBeanDefinition) {
+			return (RootBeanDefinition) bd;
+		}
 
 		synchronized (this.mergedBeanDefinitions) {
 			RootBeanDefinition mbd = null;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -347,7 +347,7 @@ private String[] doGetBeanNamesForType(Class<?> type, boolean includeNonSingleto
 			// is not defined as alias for some other bean.
 			if (!isAlias(beanName)) {
 				try {
-					RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
+					RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName, true);
 					// Only check bean definition if it is complete.
 					if (!mbd.isAbstract() && (allowEagerInit ||
 							((mbd.hasBeanClass() || !mbd.isLazyInit() || this.allowEagerClassLoading)) &&
