[syncope] branch 2_0_X updated: [SYNCOPE-1583] Fix

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_0_X by this push:
     new 89628f3  [SYNCOPE-1583] Fix
89628f3 is described below

commit 89628f33d37fa0a8855d6813880430692d9d2cab
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Jul 22 09:46:23 2020 +0200

    [SYNCOPE-1583] Fix
---
 .../syncope/core/provisioning/java/MappingManagerImpl.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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 2165178..25e7dcf 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
@@ -412,8 +412,14 @@ public class MappingManagerImpl implements MappingManager {
 
             if (intAttrName.getEnclosingGroup() != null) {
                 Group group = 
groupDAO.findByName(intAttrName.getEnclosingGroup());
-                if (group == null || 
groupableRelatable.getMembership(group.getKey()) == null) {
-                    LOG.warn("No membership for {} in {}, ignoring",
+                if (group == null
+                        || any instanceof User
+                                ? 
!groupDAO.findUDynMembers(group).contains(any.getKey())
+                                : any instanceof AnyObject
+                                        ? 
!groupDAO.findADynMembers(group).contains(any.getKey())
+                                        : false) {
+
+                    LOG.warn("No (dyn) membership for {} in {}, ignoring",
                             intAttrName.getEnclosingGroup(), 
groupableRelatable);
                 } else {
                     references.add(group);