Repository: syncope Updated Branches: refs/heads/master 16f955516 -> 37c709727
[SYNCOPE-1235] Added conditions for AnyObject Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/37c70972 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/37c70972 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/37c70972 Branch: refs/heads/master Commit: 37c709727e8f4833e38580404c0145d1472b91ef Parents: 16f9555 Author: skylark17 <[email protected]> Authored: Wed Nov 15 12:05:16 2017 +0100 Committer: skylark17 <[email protected]> Committed: Wed Nov 15 12:06:52 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/syncope/core/logic/GroupLogic.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/37c70972/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 c1aa1ee..8d94807 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 @@ -261,8 +261,8 @@ public class GroupLogic extends AbstractAnyLogic<GroupTO, GroupPatch> { patch.getResources().addAll(resources.stream(). map(resource -> new StringPatchItem.Builder().operation(PatchOperation.DELETE).value(resource).build()). collect(Collectors.toList())); - // [SYNCOPE-1235] patch.setUDynMembershipCond(group.getUDynMembershipCond()); + patch.getADynMembershipConds().putAll(group.getADynMembershipConds()); return binder.getGroupTO(provisioningManager.unlink(patch)); } @@ -303,7 +303,7 @@ public class GroupLogic extends AbstractAnyLogic<GroupTO, GroupPatch> { patch.getResources().addAll(resources.stream().map(resource -> new StringPatchItem.Builder().operation(PatchOperation.DELETE).value(resource).build()). collect(Collectors.toList())); - // [SYNCOPE-1235] + patch.getADynMembershipConds().putAll(group.getADynMembershipConds()); patch.setUDynMembershipCond(group.getUDynMembershipCond()); return update(patch, nullPriorityAsync);
