TransactionAspectSupport stores given PlatformTransactionManager instance as strong reference

Issue: SPR-14609

Author: jhoeller

spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java

@@ -128,6 +128,8 @@ public static TransactionStatus currentTransactionStatus() throws NoTransactionE
 
 	private String transactionManagerBeanName;
 
+	private PlatformTransactionManager transactionManager;
+
 	private TransactionAttributeSource transactionAttributeSource;
 
 	private BeanFactory beanFactory;
@@ -158,16 +160,14 @@ protected final String getTransactionManagerBeanName() {
 	 * @see #setTransactionManagerBeanName
 	 */
 	public void setTransactionManager(PlatformTransactionManager transactionManager) {
-		if (transactionManager != null) {
-			this.transactionManagerCache.put(DEFAULT_TRANSACTION_MANAGER_KEY, transactionManager);
-		}
+		this.transactionManager = transactionManager;
 	}
 
 	/**
 	 * Return the default transaction manager, or {@code null} if unknown.
 	 */
 	public PlatformTransactionManager getTransactionManager() {
-		return this.transactionManagerCache.get(DEFAULT_TRANSACTION_MANAGER_KEY);
+		return this.transactionManager;
 	}
 
 	/**
@@ -240,11 +240,11 @@ protected final BeanFactory getBeanFactory() {
 	 */
 	@Override
 	public void afterPropertiesSet() {
-		if (getTransactionManager() == null && this.beanFactory == null) {
+		if (getTransactionManager() == null && getBeanFactory() == null) {
 			throw new IllegalStateException(
 					"Setting the property 'transactionManager' or running in a BeanFactory is required");
 		}
-		if (this.transactionAttributeSource == null) {
+		if (getTransactionAttributeSource() == null) {
 			throw new IllegalStateException(
 					"Either 'transactionAttributeSource' or 'transactionAttributes' is required: " +
 					"If there are no transactional methods, then don't use a transaction aspect.");
@@ -363,9 +363,12 @@ else if (StringUtils.hasText(this.transactionManagerBeanName)) {
 		else {
 			PlatformTransactionManager defaultTransactionManager = getTransactionManager();
 			if (defaultTransactionManager == null) {
-				defaultTransactionManager = this.beanFactory.getBean(PlatformTransactionManager.class);
-				this.transactionManagerCache.putIfAbsent(
-						DEFAULT_TRANSACTION_MANAGER_KEY, defaultTransactionManager);
+				defaultTransactionManager = this.transactionManagerCache.get(DEFAULT_TRANSACTION_MANAGER_KEY);
+				if (defaultTransactionManager == null) {
+					defaultTransactionManager = this.beanFactory.getBean(PlatformTransactionManager.class);
+					this.transactionManagerCache.putIfAbsent(
+							DEFAULT_TRANSACTION_MANAGER_KEY, defaultTransactionManager);
+				}
 			}
 			return defaultTransactionManager;
 		}
@@ -567,6 +570,7 @@ protected final class TransactionInfo {
 
 		public TransactionInfo(PlatformTransactionManager transactionManager,
 				TransactionAttribute transactionAttribute, String joinpointIdentification) {
+
 			this.transactionManager = transactionManager;
 			this.transactionAttribute = transactionAttribute;
 			this.joinpointIdentification = joinpointIdentification;