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/01/25 17:19:55 UTC
[2/2] syncope git commit: [SYNCOPE-1002] Forgot to consider any
object's name in some places
[SYNCOPE-1002] Forgot to consider any object's name in some places
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e06281c0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e06281c0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e06281c0
Branch: refs/heads/master
Commit: e06281c09a294275ead6dbd3a0c3775094df860c
Parents: 927bb34
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Wed Jan 25 18:19:17 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Wed Jan 25 18:19:30 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/syncope/common/lib/AnyOperations.java | 4 ++++
.../java/org/apache/syncope/common/lib/patch/AnyObjectPatch.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e06281c0/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 b4cc329..15a85d3 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
@@ -529,6 +529,10 @@ public final class AnyOperations {
AnyObjectTO result = SerializationUtils.clone(anyObjectTO);
patch(anyObjectTO, anyObjectPatch, result);
+ if (anyObjectPatch.getName() != null) {
+ result.setName(anyObjectPatch.getName().getValue());
+ }
+
// 1. relationships
for (RelationshipPatch relPatch : anyObjectPatch.getRelationships()) {
if (relPatch.getRelationshipTO() == null) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/e06281c0/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyObjectPatch.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyObjectPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyObjectPatch.java
index ddb4ac3..75298a9 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyObjectPatch.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/AnyObjectPatch.java
@@ -62,7 +62,7 @@ public class AnyObjectPatch extends AnyPatch {
@Override
public boolean isEmpty() {
- return super.isEmpty() && relationships.isEmpty() && memberships.isEmpty();
+ return super.isEmpty() && name == null && relationships.isEmpty() && memberships.isEmpty();
}
}