From: Olivier Lamy Date: Thu, 13 Dec 2012 09:15:46 +0000 (+0000) Subject: no need to try updating the user if userManagerImpl is read only X-Git-Tag: archiva-1.4-M4~511 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ad540803afcd1107ed186eac0d0c85a1dd11774d;p=archiva.git no need to try updating the user if userManagerImpl is read only git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1421158 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java index b9c79564b..767d90e7b 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java @@ -140,7 +140,10 @@ public class ArchivaUserManagerAuthenticator 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 ArchivaUserManagerAuthenticator try { + securityPolicy.extensionExcessiveLoginAttempts( user ); + } finally { - userManager.updateUser( user ); + if ( !userManager.isReadOnly() ) + { + userManager.updateUser( user ); + } } //return new AuthenticationResult( false, source.getPrincipal(), null, authnResultExceptionsMap );