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

[ilgrosso]

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

ilgrosso 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 3d75e1d  Revert "improving transaction interceptor to preserve already 
marked transactions (#198)"
3d75e1d is described below

commit 3d75e1de7cb19f8f45bec1c34e27edcfc941062c
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Jun 17 08:18:58 2020 +0200

    Revert "improving transaction interceptor to preserve already marked 
transactions (#198)"
    
    This reverts commit 57b05f85b17a4b9c248d4bc635e26815c2b6d140.
---
 .../core/persistence/jpa/spring/DomainTransactionInterceptor.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 01bfcf9..7d8883a 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,10 +47,7 @@ public class DomainTransactionInterceptor extends 
TransactionInterceptor {
             TransactionAttribute txAttr = 
origTxAttrSource.getTransactionAttribute(method, targetClass);
 
             if (txAttr instanceof DefaultTransactionAttribute) {
-                DefaultTransactionAttribute dta = 
(DefaultTransactionAttribute) txAttr;
-                if (dta.getQualifier() == null) {
-                    dta.setQualifier(AuthContextUtils.getDomain());
-                }
+                ((DefaultTransactionAttribute) 
txAttr).setQualifier(AuthContextUtils.getDomain());
             }
 
             return txAttr;