Restore original factory method caching (addressing Boot regressions)

Issue: SPR-17358
2018-10-10 23:53:13 +02:00
parent d05924165b
commit c89e3e6e0d
2 changed files with 25 additions and 17 deletions
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -775,11 +775,6 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 			}
 		}

-		if (uniqueCandidate != null) {
-			synchronized (mbd.constructorArgumentLock) {
-				mbd.resolvedConstructorOrFactoryMethod = uniqueCandidate;
-			}
-		}
 		if (commonType == null) {
 			return null;
 		}