Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 d66306866 -> 70b20b20b


AMBARI-18039. Ldap Sync filter logged out after the ldapsearch query happens 
(oleewere)


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

Branch: refs/heads/branch-2.4
Commit: 70b20b20bd21d223838d4426e87b88abfe302878
Parents: d663068
Author: oleewere <oleew...@gmail.com>
Authored: Fri Aug 5 11:37:36 2016 +0200
Committer: oleewere <oleew...@gmail.com>
Committed: Fri Aug 5 12:03:45 2016 +0200

----------------------------------------------------------------------
 .../ambari/server/security/ldap/AmbariLdapDataPopulator.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/70b20b20/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
index d38ec69..91ef97a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
@@ -654,10 +654,10 @@ public class AmbariLdapDataPopulator {
     String encodedFilter = filter.encode();
 
     do {
+      LOG.trace("LDAP User Query - Base DN: '{}' ; Filter: '{}'", baseDn, 
encodedFilter);
       List dtos = 
configuration.getLdapServerProperties().isPaginationEnabled() ?
         ldapTemplate.search(baseDn, encodedFilter, searchControls, 
ldapUserContextMapper, processor) :
         ldapTemplate.search(baseDn, encodedFilter, searchControls, 
ldapUserContextMapper);
-      LOG.trace("LDAP User Query - Base DN: '{}' ; Filter: '{}'", baseDn, 
encodedFilter);
       for (Object dto : dtos) {
         if (dto != null) {
           users.add((LdapUserDto)dto);

Reply via email to