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

[ilgrosso]

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

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


The following commit(s) were added to refs/heads/2_0_X by this push:
     new 029510f  Revert "improving transaction interceptor to preserve already 
marked transact… (#198)"
029510f is described below

commit 029510f5a56f919cc47b4d617a7c40217583a23c
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Jun 17 08:19:09 2020 +0200

    Revert "improving transaction interceptor to preserve already marked 
transact… (#198)"
    
    This reverts commit 9156491ccef764155d44ed85a9bc57eb95e0f509.
---
 .../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 7cb264c..691f5e4 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
@@ -50,10 +50,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;