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 2017/09/15 10:36:25 UTC
[2/5] syncope git commit: Ensuring to select membership resources for
DELETE only when the given membership is requested for removal
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/fcb0d833
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fcb0d833
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fcb0d833
Branch: refs/heads/master
Commit: fcb0d833e78b5f733787a9d30c5415817ba4afcc
Parents: 88b3086
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Sep 15 12:03:19 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 15 12:03:19 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/fcb0d833/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 eafba37..1bdfa36 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
@@ -333,7 +333,9 @@ public class AnyObjectDataBinderImpl extends AbstractAnyDataBinder implements An
attr.setOwner(null);
});
- toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.get().getRightEnd().getKey()));
+ if (membPatch.getOperation() == PatchOperation.DELETE) {
+ toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.get().getRightEnd().getKey()));
+ }
}
if (membPatch.getOperation() == PatchOperation.ADD_REPLACE) {
Group group = groupDAO.find(membPatch.getGroup());
http://git-wip-us.apache.org/repos/asf/syncope/blob/fcb0d833/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 ce3a127..6badbef 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
@@ -426,7 +426,9 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat
attr.setMembership(null);
});
- toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.get().getRightEnd().getKey()));
+ if (membPatch.getOperation() == PatchOperation.DELETE) {
+ toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.get().getRightEnd().getKey()));
+ }
}
if (membPatch.getOperation() == PatchOperation.ADD_REPLACE) {
Group group = groupDAO.find(membPatch.getGroup());