You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2016/08/05 10:03:21 UTC

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

Repository: ambari
Updated Branches:
  refs/heads/trunk d4a9a635c -> 4b76d2eb7


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/4b76d2eb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b76d2eb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b76d2eb

Branch: refs/heads/trunk
Commit: 4b76d2eb756028746d1911c32d87bd4179bd484f
Parents: d4a9a63
Author: oleewere <ol...@gmail.com>
Authored: Fri Aug 5 11:37:36 2016 +0200
Committer: oleewere <ol...@gmail.com>
Committed: Fri Aug 5 11:37:52 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/4b76d2eb/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);