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/04/05 11:10:45 UTC
[2/2] syncope git commit: [SYNCOPE-1057] Missing bits
[SYNCOPE-1057] Missing bits
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c8cef3d9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c8cef3d9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c8cef3d9
Branch: refs/heads/master
Commit: c8cef3d92dda92a3c8f81e1740928789d1641d89
Parents: fe07e12
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Wed Apr 5 13:10:23 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Wed Apr 5 13:10:32 2017 +0200
----------------------------------------------------------------------
.../org/apache/syncope/common/lib/AnyOperations.java | 12 +++++-------
.../core/provisioning/java/utils/ConnObjectUtils.java | 2 ++
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/c8cef3d9/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java b/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
index 277d921..1da4df7 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
@@ -403,14 +403,12 @@ public final class AnyOperations {
result.setGroupOwner(
replacePatchItem(updated.getGroupOwner(), original.getGroupOwner(), new StringReplacePatchItem()));
- if (!incremental) {
- // 3. dynamic membership
- result.setUDynMembershipCond(updated.getUDynMembershipCond());
- result.getADynMembershipConds().putAll(updated.getADynMembershipConds());
+ // 3. dynamic membership
+ result.setUDynMembershipCond(updated.getUDynMembershipCond());
+ result.getADynMembershipConds().putAll(updated.getADynMembershipConds());
- // 4. type extensions
- result.getTypeExtensions().addAll(updated.getTypeExtensions());
- }
+ // 4. type extensions
+ result.getTypeExtensions().addAll(updated.getTypeExtensions());
return result;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/c8cef3d9/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
index fbd7c32..be35d61 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
@@ -219,6 +219,8 @@ public class ConnObjectUtils {
}
updatedGroup.setUserOwner(originalGroup.getUserOwner());
updatedGroup.setGroupOwner(originalGroup.getGroupOwner());
+ updatedGroup.setUDynMembershipCond(originalGroup.getUDynMembershipCond());
+ updatedGroup.getADynMembershipConds().putAll(originalGroup.getADynMembershipConds());
updatedGroup.getTypeExtensions().addAll(originalGroup.getTypeExtensions());
anyPatch = (T) AnyOperations.diff(updatedGroup, originalGroup, true);