You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by sk...@apache.org on 2017/11/15 10:30:19 UTC
syncope git commit: [SYNCOPE-1235]
Repository: syncope
Updated Branches:
refs/heads/2_0_X 979f853e6 -> 9a4a1323f
[SYNCOPE-1235]
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9a4a1323
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9a4a1323
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9a4a1323
Branch: refs/heads/2_0_X
Commit: 9a4a1323f6f378b2e53b8657524568ce7c5709cc
Parents: 979f853
Author: skylark17 <ma...@tirasa.net>
Authored: Wed Nov 15 11:30:10 2017 +0100
Committer: skylark17 <ma...@tirasa.net>
Committed: Wed Nov 15 11:30:10 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/syncope/core/logic/GroupLogic.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/9a4a1323/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
index f4b25d8..d12b516 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java
@@ -276,7 +276,7 @@ public class GroupLogic extends AbstractAnyLogic<GroupTO, GroupPatch> {
AuthContextUtils.getAuthorizations().get(StandardEntitlement.GROUP_UPDATE),
group.getRealm());
securityChecks(effectiveRealms, group.getRealm(), group.getKey());
-
+
GroupPatch patch = new GroupPatch();
patch.setKey(key);
patch.getResources().addAll(CollectionUtils.collect(resources, new Transformer<String, StringPatchItem>() {
@@ -286,6 +286,8 @@ public class GroupLogic extends AbstractAnyLogic<GroupTO, GroupPatch> {
return new StringPatchItem.Builder().operation(PatchOperation.DELETE).value(resource).build();
}
}));
+ // [SYNCOPE-1235]
+ patch.setUDynMembershipCond(group.getUDynMembershipCond());
return binder.getGroupTO(provisioningManager.unlink(patch));
}
@@ -334,6 +336,8 @@ public class GroupLogic extends AbstractAnyLogic<GroupTO, GroupPatch> {
return new StringPatchItem.Builder().operation(PatchOperation.DELETE).value(resource).build();
}
}));
+ // [SYNCOPE-1235]
+ patch.setUDynMembershipCond(group.getUDynMembershipCond());
return update(patch, nullPriorityAsync);
}