[syncope] branch master 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 master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new a66f4ac  Revert "improving transaction interceptor to preserve already 
marked transactions (#198)"
a66f4ac is described below

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

    Revert "improving transaction interceptor to preserve already marked 
transactions (#198)"
    
    This reverts commit 8ccfb1e558c54d524865bc9aeb332ecb28f694f0.
---
 .../persistence/jpa/spring/DomainTransactionAnnotationParser.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionAnnotationParser.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionAnnotationParser.java
index 104ddc4..3dfb385 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionAnnotationParser.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainTransactionAnnotationParser.java
@@ -32,9 +32,7 @@ public class DomainTransactionAnnotationParser extends 
SpringTransactionAnnotati
     protected TransactionAttribute parseTransactionAnnotation(final 
AnnotationAttributes attributes) {
         RuleBasedTransactionAttribute rbta =
                 (RuleBasedTransactionAttribute) 
super.parseTransactionAnnotation(attributes);
-        if (rbta.getQualifier() == null) {
-            rbta.setQualifier(AuthContextUtils.getDomain());
-        }
+        rbta.setQualifier(AuthContextUtils.getDomain());
         return rbta;
     }
 }