From e2cee9928376b5504213d7c67c9b1d733d22cb2a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 18 Apr 2013 13:21:37 +0000 Subject: [PATCH] due to chained user manager we must check cause in case of a UserNotFoundException git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1469310 13f79535-47bb-0310-9956-ffa450edef68 --- .../web/security/ArchivaConfigurableUsersManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java index 50f775d6e..0cc1a4e89 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java @@ -44,7 +44,7 @@ import java.util.Map; * @author Olivier Lamy * @since 1.4-M4 */ -@Service( "userManager#archiva" ) +@Service("userManager#archiva") public class ArchivaConfigurableUsersManager extends AbstractUserManager { @@ -58,7 +58,7 @@ public class ArchivaConfigurableUsersManager private Map userManagerPerId; @Inject - @Named( value = "cache#users" ) + @Named(value = "cache#users") private Cache usersCache; private boolean useUsersCache; @@ -231,6 +231,10 @@ public class ArchivaConfigurableUsersManager { if ( lastException != null ) { + if ( lastException instanceof UserNotFoundException ) + { + throw (UserNotFoundException) lastException; + } throw new UserManagerException( lastException.getMessage(), lastException ); } } @@ -451,7 +455,6 @@ public class ArchivaConfigurableUsersManager } - @Override public boolean isFinalImplementation() { -- 2.39.5