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/08/31 15:24:13 UTC
[2/4] syncope git commit: Ensure to send the connObjectKey is
__NAME__ is different from __UID__
Ensure to send the connObjectKey is __NAME__ is different from __UID__
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3228a3d5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3228a3d5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3228a3d5
Branch: refs/heads/2_0_X
Commit: 3228a3d51808cf475e5744c87ffcfc69ef4f6404
Parents: b29710c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Aug 31 17:17:37 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Aug 31 17:17:37 2017 +0200
----------------------------------------------------------------------
.../syncope/core/provisioning/java/MappingManagerImpl.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3228a3d5/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 54ada98..1a47080 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
@@ -88,6 +88,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.apache.syncope.core.provisioning.api.data.ItemTransformer;
+import org.identityconnectors.framework.common.objects.Name;
@Component
public class MappingManagerImpl implements MappingManager {
@@ -194,7 +195,12 @@ public class MappingManagerImpl implements MappingManager {
attributes.add(AttributeBuilder.build(
MappingUtils.getConnObjectKeyItem(provision).getExtAttrName(), connObjectKey));
}
- attributes.add(MappingUtils.evaluateNAME(any, provision, connObjectKey));
+ Name name = MappingUtils.evaluateNAME(any, provision, connObjectKey);
+ attributes.add(name);
+ if (connObjectKey != null && !connObjectKey.equals(name.getNameValue()) && connObjectKeyExtAttr == null) {
+ attributes.add(AttributeBuilder.build(
+ MappingUtils.getConnObjectKeyItem(provision).getExtAttrName(), connObjectKey));
+ }
if (enable != null) {
attributes.add(AttributeBuilder.buildEnabled(enable));