Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore original MethodMapTransactionAttributeSource matching rules

Browse Source 
Issue: SPR-16733
This commit is contained in:
Juergen Hoeller
2018-04-17 10:56:16 +02:00
parent ff2228fdaf
commit c5b524db7c
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
View File

@@ -32,7 +32,6 @@ import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.PatternMatchUtils; import org.springframework.util.PatternMatchUtils;
import org.springframework.util.ReflectionUtils;
/** /**
* Simple {@link TransactionAttributeSource} implementation that * Simple {@link TransactionAttributeSource} implementation that
@@ -145,7 +144,7 @@ public class MethodMapTransactionAttributeSource
Assert.notNull(mappedName, "Mapped name must not be null"); Assert.notNull(mappedName, "Mapped name must not be null");
String name = clazz.getName() + '.' + mappedName; String name = clazz.getName() + '.' + mappedName;
Method[] methods = ReflectionUtils.getAllDeclaredMethods(clazz); Method[] methods = clazz.getDeclaredMethods();
List<Method> matchingMethods = new ArrayList<>(); List<Method> matchingMethods = new ArrayList<>();
for (Method method : methods) { for (Method method : methods) {
if (isMatch(method.getName(), mappedName)) { if (isMatch(method.getName(), mappedName)) {

2
spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml
View File

@@ -23,7 +23,7 @@
<property name="transactionAttributeSource"> <property name="transactionAttributeSource">
<value> <value>
org.springframework.tests.sample.beans.ITestBean.s*=PROPAGATION_MANDATORY org.springframework.tests.sample.beans.ITestBean.s*=PROPAGATION_MANDATORY
org.springframework.tests.sample.beans.ITestBean.setAg*=PROPAGATION_REQUIRED org.springframework.tests.sample.beans.AgeHolder.setAg*=PROPAGATION_REQUIRED
org.springframework.tests.sample.beans.ITestBean.set*= PROPAGATION_SUPPORTS , readOnly org.springframework.tests.sample.beans.ITestBean.set*= PROPAGATION_SUPPORTS , readOnly
</value> </value>
</property> </property>