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 2016/06/24 08:40:26 UTC
syncope git commit: Fixing failing test
Repository: syncope
Updated Branches:
refs/heads/master 801239f23 -> e7357ac7a
Fixing failing test
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e7357ac7
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e7357ac7
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e7357ac7
Branch: refs/heads/master
Commit: e7357ac7a356d4537abe1507c38b7bb494e7908e
Parents: 801239f
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Jun 24 10:40:19 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Jun 24 10:40:19 2016 +0200
----------------------------------------------------------------------
.../core/provisioning/java/MappingManagerImpl.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e7357ac7/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
index 652cb90..d8884fd 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
@@ -160,14 +160,16 @@ public class MappingManagerImpl implements MappingManager {
if (preparedAttr.getValue() != null) {
Attribute alreadyAdded = AttributeUtil.find(preparedAttr.getValue().getName(), attributes);
- if (alreadyAdded == null
- || alreadyAdded.getValue() == null || alreadyAdded.getValue().isEmpty()) {
-
+ if (alreadyAdded == null) {
attributes.add(preparedAttr.getValue());
} else {
attributes.remove(alreadyAdded);
- Set<Object> values = new HashSet<>(alreadyAdded.getValue());
+ Set<Object> values = new HashSet<>();
+ if (alreadyAdded.getValue() != null && !alreadyAdded.getValue().isEmpty()) {
+ values.addAll(alreadyAdded.getValue());
+ }
+
values.addAll(preparedAttr.getValue().getValue());
attributes.add(AttributeBuilder.build(preparedAttr.getValue().getName(), values));