Repository: syncope Updated Branches: refs/heads/2_0_X 9a4a1323f -> 23acffb41
[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/23acffb4 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/23acffb4 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/23acffb4 Branch: refs/heads/2_0_X Commit: 23acffb41caee0440f36f5038d8149c54749c86b Parents: 9a4a132 Author: skylark17 <[email protected]> Authored: Wed Nov 15 12:05:16 2017 +0100 Committer: skylark17 <[email protected]> Committed: Wed Nov 15 12:05:16 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/23acffb4/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 d12b516..8ae90ce 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 @@ -286,8 +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()); + patch.getADynMembershipConds().putAll(group.getADynMembershipConds()); return binder.getGroupTO(provisioningManager.unlink(patch)); } @@ -336,7 +336,7 @@ public class GroupLogic extends AbstractAnyLogic<GroupTO, GroupPatch> { return new StringPatchItem.Builder().operation(PatchOperation.DELETE).value(resource).build(); } })); - // [SYNCOPE-1235] + patch.getADynMembershipConds().putAll(group.getADynMembershipConds()); patch.setUDynMembershipCond(group.getUDynMembershipCond()); return update(patch, nullPriorityAsync);
