From c85127d3f816d9cf44a0223073d7e37d569a8cdb Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 17 Jun 2015 13:02:26 +0200 Subject: [PATCH] TransactionAttributeSourcePointcut pointcut skips target classes with TransactionalProxy marker (e.g. Spring Data proxies) Issue: SPR-13109 --- .../TransactionAttributeSourcePointcut.java | 5 ++- .../interceptor/TransactionalProxy.java | 33 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionalProxy.java diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java index eca02e8b329..fa6d9e1ac64 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +34,9 @@ abstract class TransactionAttributeSourcePointcut extends StaticMethodMatcherPoi @Override public boolean matches(Method method, Class targetClass) { + if (TransactionalProxy.class.isAssignableFrom(targetClass)) { + return false; + } TransactionAttributeSource tas = getTransactionAttributeSource(); return (tas == null || tas.getTransactionAttribute(method, targetClass) != null); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionalProxy.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionalProxy.java new file mode 100644 index 00000000000..a5c0429a8f0 --- /dev/null +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionalProxy.java @@ -0,0 +1,33 @@ +/* + * Copyright 2002-2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.transaction.interceptor; + +import org.springframework.aop.SpringProxy; + +/** + * A marker interface for manually created transactional proxies. + * + *

{@link TransactionAttributeSourcePointcut} will ignore such existing + * transactional proxies during AOP auto-proxying and therefore avoid + * re-processing transaction metadata on them. + * + * @author Juergen Hoeller + * @since 4.1.7 + */ +public interface TransactionalProxy extends SpringProxy { + +}