archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1469310 - /archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
Date Thu, 18 Apr 2013 13:21:37 GMT
Author: olamy
Date: Thu Apr 18 13:21:37 2013
New Revision: 1469310

URL: http://svn.apache.org/r1469310
Log:
due to chained user manager we must check cause in case of a UserNotFoundException

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java?rev=1469310&r1=1469309&r2=1469310&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
Thu Apr 18 13:21:37 2013
@@ -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 ArchivaConfigurableUsersMan
     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 ArchivaConfigurableUsersMan
         {
             if ( lastException != null )
             {
+                if ( lastException instanceof UserNotFoundException )
+                {
+                    throw (UserNotFoundException) lastException;
+                }
                 throw new UserManagerException( lastException.getMessage(), lastException
);
             }
         }
@@ -451,7 +455,6 @@ public class ArchivaConfigurableUsersMan
     }
 
 
-
     @Override
     public boolean isFinalImplementation()
     {



Mime
View raw message