Merge pull request spring-projects#1 from elost/feature/fix-concurrent-post-processors-manipulation

fix concurrent postprocessors manipulation

Author: elost

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java

@@ -148,11 +148,7 @@ protected DefaultListableBeanFactory buildInternalBeanFactory(ConfigurableBeanFa
 
 		// Filter out BeanPostProcessors that are part of the AOP infrastructure,
 		// since those are only meant to apply to beans defined in the original factory.
-		for (Iterator<BeanPostProcessor> it = internalBeanFactory.getBeanPostProcessors().iterator(); it.hasNext();) {
-			if (it.next() instanceof AopInfrastructureBean) {
-				it.remove();
-			}
-		}
+		internalBeanFactory.removePostprocessorsOfType(AopInfrastructureBean.class);
 
 		return internalBeanFactory;
 	}

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java

@@ -429,7 +429,7 @@ public Object applyBeanPostProcessorsAfterInitialization(Object existingBean, St
 
 	@Override
 	public void destroyBean(Object existingBean) {
-		new DisposableBeanAdapter(existingBean, getBeanPostProcessors(), getAccessControlContext()).destroy();
+		new DisposableBeanAdapter(existingBean, getBeanPostProcessorsMutable(), getAccessControlContext()).destroy();
 	}
 
 

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

@@ -145,7 +145,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	private final List<StringValueResolver> embeddedValueResolvers = new LinkedList<StringValueResolver>();
 
 	/** BeanPostProcessors to apply in createBean */
-	private final List<BeanPostProcessor> beanPostProcessors = new ArrayList<BeanPostProcessor>();
+	private final List<BeanPostProcessor> beanPostProcessors = Collections.synchronizedList(new ArrayList<BeanPostProcessor>());
 
 	/** Indicates whether any InstantiationAwareBeanPostProcessors have been registered */
 	private boolean hasInstantiationAwareBeanPostProcessors;
@@ -837,10 +837,32 @@ public int getBeanPostProcessorCount() {
 	 * Return the list of BeanPostProcessors that will get applied
 	 * to beans created with this factory.
 	 */
-	public List<BeanPostProcessor> getBeanPostProcessors() {
+	public List<BeanPostProcessor> getBeanPostProcessorsMutable() {
 		return this.beanPostProcessors;
 	}
 
+	/**
+	 * Return the list of BeanPostProcessors that will get applied
+	 * to beans created with this factory.
+	 */
+	public List<BeanPostProcessor> getBeanPostProcessors() {
+		synchronized (beanPostProcessors) {
+			return Collections.unmodifiableList(
+					new ArrayList<BeanPostProcessor>(this.beanPostProcessors)
+			);
+		}
+	}
+
+	public <T> void removePostprocessorsOfType(Class<T> type) {
+		synchronized (beanPostProcessors) {
+			for (Iterator<BeanPostProcessor> it = beanPostProcessors.iterator(); it.hasNext(); ) {
+				if (type.isAssignableFrom(it.next().getClass())) {
+					it.remove();
+				}
+			}
+		}
+	}
+
 	/**
 	 * Return whether this factory holds a InstantiationAwareBeanPostProcessor
 	 * that will get applied to singleton beans on shutdown.
@@ -1054,7 +1076,7 @@ public void destroyBean(String beanName, Object beanInstance) {
 	 * @param mbd the merged bean definition
 	 */
 	protected void destroyBean(String beanName, Object beanInstance, RootBeanDefinition mbd) {
-		new DisposableBeanAdapter(beanInstance, beanName, mbd, getBeanPostProcessors(), getAccessControlContext()).destroy();
+		new DisposableBeanAdapter(beanInstance, beanName, mbd, getBeanPostProcessorsMutable(), getAccessControlContext()).destroy();
 	}
 
 	@Override
@@ -1625,7 +1647,7 @@ public boolean isBeanNameInUse(String beanName) {
 	protected boolean requiresDestruction(Object bean, RootBeanDefinition mbd) {
 		return (bean != null &&
 				(DisposableBeanAdapter.hasDestroyMethod(bean, mbd) || (hasDestructionAwareBeanPostProcessors() &&
-						DisposableBeanAdapter.hasApplicableProcessors(bean, getBeanPostProcessors()))));
+						DisposableBeanAdapter.hasApplicableProcessors(bean, getBeanPostProcessorsMutable()))));
 	}
 
 	/**
@@ -1648,7 +1670,7 @@ protected void registerDisposableBeanIfNecessary(String beanName, Object bean, R
 				// work for the given bean: DestructionAwareBeanPostProcessors,
 				// DisposableBean interface, custom destroy method.
 				registerDisposableBean(beanName,
-						new DisposableBeanAdapter(bean, beanName, mbd, getBeanPostProcessors(), acc));
+						new DisposableBeanAdapter(bean, beanName, mbd, getBeanPostProcessorsMutable(), acc));
 			}
 			else {
 				// A bean with a custom scope...
@@ -1657,7 +1679,7 @@ protected void registerDisposableBeanIfNecessary(String beanName, Object bean, R
 					throw new IllegalStateException("No Scope registered for scope name '" + mbd.getScope() + "'");
 				}
 				scope.registerDestructionCallback(beanName,
-						new DisposableBeanAdapter(bean, beanName, mbd, getBeanPostProcessors(), acc));
+						new DisposableBeanAdapter(bean, beanName, mbd, getBeanPostProcessorsMutable(), acc));
 			}
 		}
 	}

spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java

@@ -219,11 +219,7 @@ public void setBeanFactory(BeanFactory beanFactory) {
 
 		// Filter out BeanPostProcessors that are part of the AOP infrastructure,
 		// since those are only meant to apply to beans defined in the original factory.
-		for (Iterator<BeanPostProcessor> it = this.scriptBeanFactory.getBeanPostProcessors().iterator(); it.hasNext();) {
-			if (it.next() instanceof AopInfrastructureBean) {
-				it.remove();
-			}
-		}
+		this.scriptBeanFactory.removePostprocessorsOfType(AopInfrastructureBean.class);
 	}
 
 	@Override