Repository: syncope Updated Branches: refs/heads/2_0_X 3fe352238 -> 86fc76eb9 refs/heads/master 88b30869d -> c4ba54c96
Ensuring to select membership resources for DELETE only when the given membership is requested for removal Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7bb15ac4 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7bb15ac4 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7bb15ac4 Branch: refs/heads/2_0_X Commit: 7bb15ac435d5bf0ec78fbc96d23eb99ab471ce3b Parents: 3fe3522 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Fri Sep 15 12:02:02 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Fri Sep 15 12:02:02 2017 +0200 ---------------------------------------------------------------------- .../core/provisioning/java/data/AnyObjectDataBinderImpl.java | 4 +++- .../syncope/core/provisioning/java/data/UserDataBinderImpl.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/7bb15ac4/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java index c2983e4..d77d578 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java @@ -355,7 +355,9 @@ public class AnyObjectDataBinderImpl extends AbstractAnyDataBinder implements An attr.setOwner(null); } - toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.getRightEnd().getKey())); + if (membPatch.getOperation() == PatchOperation.DELETE) { + toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.getRightEnd().getKey())); + } } if (membPatch.getOperation() == PatchOperation.ADD_REPLACE) { http://git-wip-us.apache.org/repos/asf/syncope/blob/7bb15ac4/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java index ff53e1b..3213da0 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java @@ -441,7 +441,9 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat attr.setMembership(null); } - toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.getRightEnd().getKey())); + if (membPatch.getOperation() == PatchOperation.DELETE) { + toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.getRightEnd().getKey())); + } } if (membPatch.getOperation() == PatchOperation.ADD_REPLACE) {
