You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2021/07/29 13:37:08 UTC
[syncope] branch 2_1_X updated: Fixing incorrect
conflictResolutionAction setting for StreamPullJobDelegate (CSV import)
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 1ba054b Fixing incorrect conflictResolutionAction setting for StreamPullJobDelegate (CSV import)
1ba054b is described below
commit 1ba054bea28e3393c80970baf217d425b8b7052e
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Jul 29 15:36:31 2021 +0200
Fixing incorrect conflictResolutionAction setting for StreamPullJobDelegate (CSV import)
---
.../core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
index 8046274..e0185b3 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
@@ -202,7 +202,7 @@ public class StreamPullJobDelegate extends PullJobDelegate implements SyncopeStr
profile = new ProvisioningProfile<>(connector, pullTask);
profile.setDryRun(false);
- profile.setConflictResolutionAction(ConflictResolutionAction.FIRSTMATCH);
+ profile.setConflictResolutionAction(conflictResolutionAction);
profile.getActions().addAll(actions);
for (PullActions action : actions) {