syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmarte...@apache.org
Subject syncope git commit: [SYNCOPE-1375] provides membership creation just in case external attribute mappend on membership attribut is really provided
Date Wed, 26 Sep 2018 09:59:57 GMT
Repository: syncope
Updated Branches:
  refs/heads/2_1_X 5564d51aa -> df5fe6c19


[SYNCOPE-1375] provides membership creation just in case external attribute mappend on membership
attribut is really provided


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/df5fe6c1
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/df5fe6c1
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/df5fe6c1

Branch: refs/heads/2_1_X
Commit: df5fe6c19556c66c32f054cb664f65e2e901d76c
Parents: 5564d51
Author: fmartelli <fabio.martelli@gmail.com>
Authored: Wed Sep 26 11:40:19 2018 +0200
Committer: fmartelli <fabio.martelli@gmail.com>
Committed: Wed Sep 26 11:59:39 2018 +0200

----------------------------------------------------------------------
 .../syncope/core/provisioning/java/MappingManagerImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/df5fe6c1/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 4fc8fec..b6c63e3 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
@@ -769,7 +769,7 @@ public class MappingManagerImpl implements MappingManager {
 
                 default:
             }
-        } else if (intAttrName.getSchemaType() != null) {
+        } else if (intAttrName.getSchemaType() != null && attr != null) {
             GroupableRelatableTO groupableTO = null;
             Group group = null;
             if (anyTO instanceof GroupableRelatableTO && intAttrName.getMembershipOfGroup()
!= null) {
@@ -829,7 +829,7 @@ public class MappingManagerImpl implements MappingManager {
                     attrTO.setSchema(intAttrName.getSchemaName());
 
                     // virtual attributes don't get transformed, iterate over original attr.getValue()
-                    if (attr != null && attr.getValue() != null && !attr.getValue().isEmpty())
{
+                    if (attr.getValue() != null && !attr.getValue().isEmpty()) {
                         attr.getValue().stream().
                                 filter(value -> value != null).
                                 forEachOrdered(value -> attrTO.getValues().add(value.toString()));


Mime
View raw message