Further locking optimizations for the retrieval of non-singleton beans

Issue: SPR-12250
(cherry picked from commit ac4103d)

Author: jhoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -262,7 +262,9 @@ public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, Strin
 
 	public Object getEarlyBeanReference(Object bean, String beanName) throws BeansException {
 		Object cacheKey = getCacheKey(bean.getClass(), beanName);
-		this.earlyProxyReferences.put(cacheKey, Boolean.TRUE);
+		if (!this.earlyProxyReferences.containsKey(cacheKey)) {
+			this.earlyProxyReferences.put(cacheKey, Boolean.TRUE);
+		}
 		return wrapIfNecessary(bean, beanName, cacheKey);
 	}
 

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

@@ -1388,7 +1388,9 @@ protected Class<?> getTypeForFactoryBean(String beanName, RootBeanDefinition mbd
 	 * @param beanName the name of the bean
 	 */
 	protected void markBeanAsCreated(String beanName) {
-		this.alreadyCreated.put(beanName, Boolean.TRUE);
+		if (!this.alreadyCreated.containsKey(beanName)) {
+			this.alreadyCreated.put(beanName, Boolean.TRUE);
+		}
 	}
 
 	/**