Skip to content

Commit e298c20

Browse files
jhoellerjhoeller
committed
@transactional qualifiers match against transaction manager definitions in parent contexts as well (SPR-7679)
1 parent 288408e commit e298c20

File tree

3 files changed

+34
-36
lines changed

3 files changed

+34
-36
lines changed

‎org.springframework.transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors.
2+
* Copyright 2002-2011 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
2121

2222
import org.springframework.beans.factory.BeanFactory;
2323
import org.springframework.beans.factory.BeanFactoryUtils;
24+
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
2425
import org.springframework.beans.factory.annotation.Qualifier;
2526
import org.springframework.beans.factory.config.BeanDefinition;
2627
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -103,24 +104,29 @@ public static PlatformTransactionManager getTransactionManager(ConfigurableLista
103104
* value (through &lt;qualifier<&gt; or @Qualifier)
104105
*/
105106
private static boolean isQualifierMatch(String qualifier, String beanName, ConfigurableListableBeanFactory bf) {
106-
if (bf.containsBeanDefinition(beanName)) {
107-
BeanDefinition bd = bf.getMergedBeanDefinition(beanName);
108-
if (bd instanceof AbstractBeanDefinition) {
109-
AbstractBeanDefinition abd = (AbstractBeanDefinition) bd;
110-
AutowireCandidateQualifier candidate = abd.getQualifier(Qualifier.class.getName());
111-
if ((candidate != null && qualifier.equals(candidate.getAttribute(AutowireCandidateQualifier.VALUE_KEY))) ||
112-
qualifier.equals(beanName) || ObjectUtils.containsElement(bf.getAliases(beanName), qualifier)) {
113-
return true;
114-
}
115-
}
116-
if (bd instanceof RootBeanDefinition) {
117-
Method factoryMethod = ((RootBeanDefinition) bd).getResolvedFactoryMethod();
118-
if (factoryMethod != null) {
119-
Qualifier targetAnnotation = factoryMethod.getAnnotation(Qualifier.class);
120-
if (targetAnnotation != null && qualifier.equals(targetAnnotation.value())) {
107+
if (bf.containsBean(beanName)) {
108+
try {
109+
BeanDefinition bd = bf.getMergedBeanDefinition(beanName);
110+
if (bd instanceof AbstractBeanDefinition) {
111+
AbstractBeanDefinition abd = (AbstractBeanDefinition) bd;
112+
AutowireCandidateQualifier candidate = abd.getQualifier(Qualifier.class.getName());
113+
if ((candidate != null && qualifier.equals(candidate.getAttribute(AutowireCandidateQualifier.VALUE_KEY))) ||
114+
qualifier.equals(beanName) || ObjectUtils.containsElement(bf.getAliases(beanName), qualifier)) {
121115
return true;
122116
}
123117
}
118+
if (bd instanceof RootBeanDefinition) {
119+
Method factoryMethod = ((RootBeanDefinition) bd).getResolvedFactoryMethod();
120+
if (factoryMethod != null) {
121+
Qualifier targetAnnotation = factoryMethod.getAnnotation(Qualifier.class);
122+
if (targetAnnotation != null && qualifier.equals(targetAnnotation.value())) {
123+
return true;
124+
}
125+
}
126+
}
127+
}
128+
catch (NoSuchBeanDefinitionException ex) {
129+
// ignore - can't compare qualifiers for a manually registered singleton object
124130
}
125131
}
126132
return false;

‎org.springframework.transaction/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2010 the original author or authors.
2+
* Copyright 2002-2011 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
2323
import org.aopalliance.intercept.MethodInvocation;
2424

2525
import org.springframework.aop.support.AopUtils;
26+
import org.springframework.context.ApplicationContext;
27+
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
2628
import org.springframework.context.support.ClassPathXmlApplicationContext;
2729
import org.springframework.transaction.CallCountingTransactionManager;
2830
import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -36,26 +38,18 @@ public class AnnotationDrivenTests extends TestCase {
3638

3739
public void testWithProxyTargetClass() throws Exception {
3840
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("annotationDrivenProxyTargetClassTests.xml", getClass());
39-
CallCountingTransactionManager tm1 = context.getBean("transactionManager1", CallCountingTransactionManager.class);
40-
CallCountingTransactionManager tm2 = context.getBean("transactionManager2", CallCountingTransactionManager.class);
41-
TransactionalService service = context.getBean("service", TransactionalService.class);
42-
assertTrue(AopUtils.isCglibProxy(service));
43-
service.setSomething("someName");
44-
assertEquals(1, tm1.commits);
45-
assertEquals(0, tm2.commits);
46-
service.doSomething();
47-
assertEquals(1, tm1.commits);
48-
assertEquals(1, tm2.commits);
49-
service.setSomething("someName");
50-
assertEquals(2, tm1.commits);
51-
assertEquals(1, tm2.commits);
52-
service.doSomething();
53-
assertEquals(2, tm1.commits);
54-
assertEquals(2, tm2.commits);
41+
doTestWithMultipleTransactionManagers(context);
5542
}
5643

5744
public void testWithConfigurationClass() throws Exception {
58-
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("annotationDrivenConfigurationClassTests.xml", getClass());
45+
AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
46+
parent.register(TransactionManagerConfiguration.class);
47+
parent.refresh();
48+
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] {"annotationDrivenConfigurationClassTests.xml"}, getClass(), parent);
49+
doTestWithMultipleTransactionManagers(context);
50+
}
51+
52+
private void doTestWithMultipleTransactionManagers(ApplicationContext context) {
5953
CallCountingTransactionManager tm1 = context.getBean("transactionManager1", CallCountingTransactionManager.class);
6054
CallCountingTransactionManager tm2 = context.getBean("transactionManager2", CallCountingTransactionManager.class);
6155
TransactionalService service = context.getBean("service", TransactionalService.class);

‎org.springframework.transaction/src/test/java/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
<bean id="txCheckingInterceptor" class="org.springframework.transaction.config.AnnotationDrivenTests$TransactionCheckingInterceptor"/>
2020

21-
<bean id="transactionManagerConfig" class="org.springframework.transaction.config.TransactionManagerConfiguration"/>
22-
2321
<bean id="service" class="org.springframework.transaction.config.TransactionalService"/>
2422

2523
</beans>

0 commit comments

Comments
 (0)