Author: olamy
Date: Thu Dec 13 09:15:46 2012
New Revision: 1421158
URL: http://svn.apache.org/viewvc?rev=1421158&view=rev
Log:
no need to try updating the user if userManagerImpl is read only
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java?rev=1421158&r1=1421157&r2=1421158&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
Thu Dec 13 09:15:46 2012
@@ -140,7 +140,10 @@ public class ArchivaUserManagerAuthentic
if ( user.getCountFailedLoginAttempts() > 0 )
{
user.setCountFailedLoginAttempts( 0 );
- userManager.updateUser( user );
+ if ( !userManager.isReadOnly() )
+ {
+ userManager.updateUser( user );
+ }
}
return new AuthenticationResult( true,
source.getPrincipal(), null );
@@ -162,11 +165,16 @@ public class ArchivaUserManagerAuthentic
try
{
+
securityPolicy.extensionExcessiveLoginAttempts( user );
+
}
finally
{
- userManager.updateUser( user );
+ if ( !userManager.isReadOnly() )
+ {
+ userManager.updateUser( user );
+ }
}
//return new AuthenticationResult( false,
source.getPrincipal(), null, authnResultExceptionsMap );