You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2006/09/18 02:58:26 UTC

svn commit: r447174 - /maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java

Author: carlos
Date: Sun Sep 17 17:58:25 2006
New Revision: 447174

URL: http://svn.apache.org/viewvc?view=rev&rev=447174
Log:
Reset bad login attempts when unlocking an user

Modified:
    maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java

Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java?view=diff&rev=447174&r1=447173&r2=447174
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java (original)
+++ maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java Sun Sep 17 17:58:25 2006
@@ -311,12 +311,19 @@
     public void updateUser( User user )
         throws PasswordRuleViolationException
     {
+        User oldUser = getUser( user.getUsername() );
+
         // If password is supplied, assume changing of password.
         if ( !StringUtils.isEmpty( user.getPassword() ) )
         {
             processPasswordChange( user );
         }
 
+        /* reset bad login attempts */
+        if ( oldUser.isLocked() && !user.isLocked() )
+        {
+            user.setFailedLoginAttempts( 0 );
+        }
         userStore.updateUser( user );
     }