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 2019/10/29 07:02:46 UTC
[syncope] branch master updated: [SYNCOPE-957] Fixing bad
cherry-pick
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 cfbb076 [SYNCOPE-957] Fixing bad cherry-pick
cfbb076 is described below
commit cfbb07674dbd9d471f169c720af3fcf6c37f6a48
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Oct 29 08:02:35 2019 +0100
[SYNCOPE-957] Fixing bad cherry-pick
---
.../core/provisioning/java/pushpull/DefaultUserPullResultHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
index dc768f8..5e79274 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
@@ -403,7 +403,7 @@ public class DefaultUserPullResultHandler extends AbstractPullResultHandler impl
Remediation entity = entityFactory.newEntity(Remediation.class);
entity.setAnyType(provision.getAnyType());
entity.setOperation(ResourceOperation.UPDATE);
- entity.setPayload(patch);
+ entity.setPayload(req);
entity.setError(report.getMessage());
entity.setInstant(new Date());
entity.setRemoteName(delta.getObject().getName().getNameValue());
@@ -608,7 +608,7 @@ public class DefaultUserPullResultHandler extends AbstractPullResultHandler impl
Remediation entity = entityFactory.newEntity(Remediation.class);
entity.setAnyType(provision.getAnyType());
entity.setOperation(ResourceOperation.UPDATE);
- entity.setPayload(patch);
+ entity.setPayload(req);
entity.setError(report.getMessage());
entity.setInstant(new Date());
entity.setRemoteName(delta.getObject().getName().getNameValue());