summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-04-18 13:21:37 +0000
committerOlivier Lamy <olamy@apache.org>2013-04-18 13:21:37 +0000
commite2cee9928376b5504213d7c67c9b1d733d22cb2a (patch)
treef7a6a5bdb79a096c8973e23f36a396f85c0ec7df
parent3bba579fe447220c19be0dc4e8dc88c7168afe70 (diff)
downloadarchiva-e2cee9928376b5504213d7c67c9b1d733d22cb2a.tar.gz
archiva-e2cee9928376b5504213d7c67c9b1d733d22cb2a.zip
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
-rw-r--r--archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java9
1 files 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<String, UserManager> userManagerPerId;
@Inject
- @Named( value = "cache#users" )
+ @Named(value = "cache#users")
private Cache<String, User> 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()
{