From 5bc40b61814ee987c4411f2cc16ea466085c5b0e Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Thu, 12 Mar 2009 03:46:45 +0000 Subject: [PATCH] [MRM-1107] change to base exception since we will also get the MustChangePasswordException in Redback 1.2 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@752762 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/web/xmlrpc/security/XmlRpcAuthenticator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/XmlRpcAuthenticator.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/XmlRpcAuthenticator.java index 2a72ab6be..19f854461 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/XmlRpcAuthenticator.java +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/XmlRpcAuthenticator.java @@ -32,7 +32,7 @@ import org.codehaus.plexus.redback.authentication.AuthenticationException; import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; import org.codehaus.plexus.redback.authorization.AuthorizationException; import org.codehaus.plexus.redback.authorization.AuthorizationResult; -import org.codehaus.plexus.redback.policy.AccountLockedException; +import org.codehaus.plexus.redback.policy.PolicyViolationException; import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.users.UserNotFoundException; @@ -86,7 +86,7 @@ public class XmlRpcAuthenticator { return securitySystem.authenticate( authenticationDataSource ); } - catch ( AccountLockedException e ) + catch ( PolicyViolationException e ) { throw new XmlRpcException( 401, e.getMessage(), e ); } -- 2.39.5