Require non-empty values for TxMgr qualifiers & bean names

sbrannen · sbrannen · commit c2101cbcf49f · 2014-12-12T21:01:00.000+01:00
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
@@ -344,7 +344,7 @@ protected PlatformTransactionManager determineTransactionManager(TransactionAttr
 			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 @@ protected PlatformTransactionManager determineTransactionManager(TransactionAttr
 			}
 			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(

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ protected PlatformTransactionManager determineTransactionManager(TransactionAttr`
`344`	`344`	`return this.transactionManager;`
`345`	`345`	`}`
`346`	`346`	`String qualifier = txAttr.getQualifier();`
`347`		`- if (StringUtils.hasLength(qualifier)) {`
	`347`	`+ if (StringUtils.hasText(qualifier)) {`
`348`	`348`	`PlatformTransactionManager txManager = this.transactionManagerCache.get(qualifier);`
`349`	`349`	`if (txManager == null) {`
`350`	`350`	`txManager = BeanFactoryAnnotationUtils.qualifiedBeanOfType(`
`@@ -353,7 +353,7 @@ protected PlatformTransactionManager determineTransactionManager(TransactionAttr`
`353`	`353`	`}`
`354`	`354`	`return txManager;`
`355`	`355`	`}`
`356`		`- else if (this.transactionManagerBeanName != null) {`
	`356`	`+ else if (StringUtils.hasText(this.transactionManagerBeanName)) {`
`357`	`357`	`PlatformTransactionManager txManager = this.transactionManagerCache.get(this.transactionManagerBeanName);`
`358`	`358`	`if (txManager == null) {`
`359`	`359`	`txManager = this.beanFactory.getBean(`