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

[an...@apache.org]

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

andreapatricelli 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 8ccfb1e  improving transaction interceptor to preserve already marked transactions (#198)
8ccfb1e is described below

commit 8ccfb1e558c54d524865bc9aeb332ecb28f694f0
Author: Andrea Patricelli <an...@apache.org>
AuthorDate: Tue Jun 16 15:00:23 2020 +0200

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

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 3dfb385..104ddc4 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,7 +32,9 @@ public class DomainTransactionAnnotationParser extends SpringTransactionAnnotati
     protected TransactionAttribute parseTransactionAnnotation(final AnnotationAttributes attributes) {
         RuleBasedTransactionAttribute rbta =
                 (RuleBasedTransactionAttribute) super.parseTransactionAnnotation(attributes);
-        rbta.setQualifier(AuthContextUtils.getDomain());
+        if (rbta.getQualifier() == null) {
+            rbta.setQualifier(AuthContextUtils.getDomain());
+        }
         return rbta;
     }
 }