IDS - fixing sync LDAP accounts issues

repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java

@@ -1712,20 +1712,18 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
                         SearchResult result = this.searchResults.next();
                         Attributes attributes = result.getAttributes();
                         Attribute uidAttribute = attributes.get(LDAPUserRegistry.this.userIdAttributeName);
-                        if (uidAttribute == null)
+                        if(uidAttribute== null)
                         {
-                            if (LDAPUserRegistry.this.errorOnMissingUID)
-                            {
+                            if (LDAPUserRegistry.this.errorOnMissingUID) {
                                 Object[] params = {result.getNameInNamespace(), LDAPUserRegistry.this.userIdAttributeName};
                                 throw new AlfrescoRuntimeException("synchronization.err.ldap.get.user.id.missing", params);
-                            }
-                            else
-                            {
+                            } else {
                                 LDAPUserRegistry.logger
                                         .warn("User returned by user search does not have mandatory user id attribute "
                                                 + attributes);
                                 continue;
                             }
+
                         }
                         String uid = (String) uidAttribute.get(0);
 
@@ -1735,7 +1733,6 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
                             // this will serve as indicator where we should restart sync in case if sync retry occurs
                             this.lastProcessedPerson = uid;
                         }
-
                         if (this.uids.contains(uid))
                         {
                             if (this.skipToLastProcessedPerson)
@@ -1760,12 +1757,18 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
                         }
 
                         this.uids.add(uid);
+                        Attribute uidAttributes = attributes.get(LDAPUserRegistry.this.userIdAttributeName);
+                        System.out.println("#######################################"+uidAttributes);
+                        if(uidAttributes!=null){
+                            LDAPUserRegistry.logger
+                                    .warn("User returned by user search mandatory user id attribute "
+                                            + uidAttributes);
+                        }
 
                         if (LDAPUserRegistry.logger.isDebugEnabled())
                         {
                             LDAPUserRegistry.logger.debug("Adding user for " + uid);
                         }
-
                         // Apply the mapped properties to the node description
                         NodeDescription nodeDescription = mapToNode(LDAPUserRegistry.this.personAttributeMapping,
                                 LDAPUserRegistry.this.personAttributeDefaults, result);
@@ -1813,6 +1816,7 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
                         this.searchResults = this.ctx.search(LDAPUserRegistry.this.userSearchBase,
                                 PersonCollection.this.query, this.userSearchCtls);
                     }
+
                 }
                 while (readyForNextPage);
                 this.searchResults.close();