From c2101cbcf49feeacb8f7796cdb69eaa0f9814fe6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 12 Dec 2014 21:01:00 +0100
Subject: [PATCH] Require non-empty values for TxMgr qualifiers & bean names

---
 .../transaction/interceptor/TransactionAspectSupport.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
index fa12fef441..20e15440da 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
@@ -344,7 +344,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
 			return this.transactionManager;
 		}
 		String qualifier = txAttr.getQualifier();
-		if (StringUtils.hasLength(qualifier)) {
+		if (StringUtils.hasText(qualifier)) {
 			PlatformTransactionManager txManager = this.transactionManagerCache.get(qualifier);
 			if (txManager == null) {
 				txManager = BeanFactoryAnnotationUtils.qualifiedBeanOfType(
@@ -353,7 +353,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
 			}
 			return txManager;
 		}
-		else if (this.transactionManagerBeanName != null) {
+		else if (StringUtils.hasText(this.transactionManagerBeanName)) {
 			PlatformTransactionManager txManager  = this.transactionManagerCache.get(this.transactionManagerBeanName);
 			if (txManager == null) {
 				txManager = this.beanFactory.getBean(