[syncope] branch 2_1_X updated: improving transaction interceptor to preserve already marked transactions (#198)

[andreapatricelli]

This is an automated email from the ASF dual-hosted git repository.

andreapatricelli pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_1_X by this push:
     new 57b05f8  improving transaction interceptor to preserve already marked 
transactions (#198)
57b05f8 is described below

commit 57b05f85b17a4b9c248d4bc635e26815c2b6d140
Author: Andrea Patricelli <andreapatrice...@apache.org>
AuthorDate: Tue Jun 16 15:00:23 2020 +0200

    improving transaction interceptor to preserve already marked transactions 
(#198)
---
 .../core/persistence/jpa/spring/DomainTransactionInterceptor.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
index 7d8883a..01bfcf9 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionInterceptor.java
@@ -47,7 +47,10 @@ public class DomainTransactionInterceptor extends 
TransactionInterceptor {
             TransactionAttribute txAttr = 
origTxAttrSource.getTransactionAttribute(method, targetClass);
 
             if (txAttr instanceof DefaultTransactionAttribute) {
-                ((DefaultTransactionAttribute) 
txAttr).setQualifier(AuthContextUtils.getDomain());
+                DefaultTransactionAttribute dta = 
(DefaultTransactionAttribute) txAttr;
+                if (dta.getQualifier() == null) {
+                    dta.setQualifier(AuthContextUtils.getDomain());
+                }
             }
 
             return txAttr;