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/12 10:55:47 UTC
svn commit: r442531 -
/maven/shared/trunk/maven-user/maven-user-acegi/src/main/java/org/apache/maven/user/acegi/MavenUserDetailsService.java
Author: carlos
Date: Tue Sep 12 01:55:47 2006
New Revision: 442531
URL: http://svn.apache.org/viewvc?view=rev&rev=442531
Log:
Fix expiration and account locking settings
Modified:
maven/shared/trunk/maven-user/maven-user-acegi/src/main/java/org/apache/maven/user/acegi/MavenUserDetailsService.java
Modified: maven/shared/trunk/maven-user/maven-user-acegi/src/main/java/org/apache/maven/user/acegi/MavenUserDetailsService.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-acegi/src/main/java/org/apache/maven/user/acegi/MavenUserDetailsService.java?view=diff&rev=442531&r1=442530&r2=442531
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-acegi/src/main/java/org/apache/maven/user/acegi/MavenUserDetailsService.java (original)
+++ maven/shared/trunk/maven-user/maven-user-acegi/src/main/java/org/apache/maven/user/acegi/MavenUserDetailsService.java Tue Sep 12 01:55:47 2006
@@ -99,16 +99,15 @@
String password = user.getEncodedPassword();
boolean enabled = true;
boolean accountNonExpired = true;
+ boolean accountNonLocked = !user.isLocked();
+ boolean credentialsNonExpired = true;
if ( user.getLastPasswordChange() != null && daysBeforeExpiration > 0 )
{
long lastPasswordChange = user.getLastPasswordChange().getTime();
long currentTime = new Date().getTime();
- accountNonExpired = lastPasswordChange + daysBeforeExpiration * MILLISECONDS_PER_DAY > currentTime;
+ credentialsNonExpired = lastPasswordChange + daysBeforeExpiration * MILLISECONDS_PER_DAY > currentTime;
}
-
- boolean credentialsNonExpired = true;
- boolean accountNonLocked = true;
UserDetails userDetails = new org.acegisecurity.userdetails.User( username, password, enabled,
accountNonExpired, credentialsNonExpired,