[exo-jcr-commits] exo-jcr SVN: r4311 - core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-04-27 08:38:57 -0400 (Wed, 27 Apr 2011)
New Revision: 4311

Modified:
   core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java
Log:
EXOJCR-1318: return only exptected attributes

Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java	2011-04-27 12:12:21 UTC (rev 4310)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java	2011-04-27 12:38:57 UTC (rev 4311)
@@ -59,6 +59,7 @@
    /**
     * {@inheritDoc}
     */
+   @Override
    protected User[] load(LdapContext ctx, int index, int length) throws Exception
    {
       User[] users = new User[length];
@@ -69,7 +70,14 @@
          SortControl sctl = new SortControl(new String[]{ldapAttrMapping.userUsernameAttr}, Control.NONCRITICAL);
          ctx.setRequestControls(new Control[]{sctl});
 
+         // returns only needed attributes for creation UserImpl in
+         // LDAPAttributeMapping.attributesToUser() method 
+         String[] returnedAtts =
+            {ldapAttrMapping.userUsernameAttr, ldapAttrMapping.userFirstNameAttr, ldapAttrMapping.userLastNameAttr,
+               ldapAttrMapping.userDisplayNameAttr, ldapAttrMapping.userMailAttr, ldapAttrMapping.userPassword};
+
          SearchControls constraints = new SearchControls();
+         constraints.setReturningAttributes(returnedAtts);
          constraints.setSearchScope(SearchControls.SUBTREE_SCOPE);
 
          results = ctx.search(searchBase, filter, constraints);
@@ -101,6 +109,7 @@
    /**
     * {@inheritDoc}
     */
+   @Override
    protected int getSize(LdapContext ctx) throws Exception
    {
       if (size < 0)