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

[do-not-reply at jboss.org]

Author: tolusha
Date: 2010-03-23 05:56:17 -0400 (Tue, 23 Mar 2010)
New Revision: 2100

Modified:
   core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java
Log:
EXOJCR-602: impossible to change user password

Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java	2010-03-23 09:16:29 UTC (rev 2099)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java	2010-03-23 09:56:17 UTC (rev 2100)
@@ -127,6 +127,7 @@
    {
       LdapContext ctx = ldapService.getLdapContext();
       String userDN = null;
+      User existingUser = null;
       try
       {
          for (int err = 0;; err++)
@@ -136,7 +137,7 @@
                userDN = getDNFromUsername(ctx, user.getUserName());
                if (userDN == null)
                   return;
-               User existingUser = getUserFromUsername(ctx, user.getUserName());
+               existingUser = getUserFromUsername(ctx, user.getUserName());
                ModificationItem[] mods = createUserModification(user, existingUser);
                if (broadcast)
                   preSave(user, false);
@@ -159,8 +160,10 @@
          ldapService.release(ctx);
       }
       // TODO really need this ?
-      if (!user.getPassword().equals("PASSWORD"))
+      if (existingUser != null && (!user.getPassword().equals(existingUser.getPassword())))
+      {
          saveUserPassword(user, userDN);
+      }
    }
 
    /**
@@ -272,11 +275,11 @@
    public LazyPageList<User> findUsersByGroup(String groupId) throws Exception
    {
       return new LazyPageList<User>(findUsersByGroupId(groupId), 10);
-   }    
+   }
 
-    /**
-    * {@inheritDoc}
-    */
+   /**
+   * {@inheritDoc}
+   */
    public ListAccess<User> findUsersByGroupId(String groupId) throws Exception
    {
       //    ArrayList<User> users = new ArrayList<User>();
@@ -334,9 +337,9 @@
       return new LazyPageList<User>(findAllUsers(), 10);
    }
 
-    /**
-    * {@inheritDoc}
-    */
+   /**
+   * {@inheritDoc}
+   */
    public ListAccess<User> findAllUsers() throws Exception
    {
       String searchBase = ldapAttrMapping.userURL;