From: Olivier Lamy <olamy@apache.org>
Date: Fri, 21 Dec 2012 17:54:37 +0000 (+0000)
Subject: simplify code
X-Git-Tag: archiva-1.4-M4~421
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=09208ec81a34875ce2f013f158de4879f024e222;p=archiva.git

simplify code

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1425055 13f79535-47bb-0310-9956-ffa450edef68
---

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 e601643fc..527b3a1de 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
@@ -42,7 +42,7 @@ import java.util.Map;
  * @author Olivier Lamy
  * @since 1.4-M4
  */
-@Service( "userManager#archiva" )
+@Service("userManager#archiva")
 public class ArchivaConfigurableUsersManager
     extends ConfigurableUserManager
 {
@@ -58,7 +58,7 @@ public class ArchivaConfigurableUsersManager
     private List<UserManagerListener> listeners = new ArrayList<UserManagerListener>();
 
     @Inject
-    @Named( value = "cache#users" )
+    @Named(value = "cache#users")
     private Cache usersCache;
 
     @Override
@@ -244,42 +244,7 @@ public class ArchivaConfigurableUsersManager
     public User getGuestUser()
         throws UserNotFoundException, UserManagerException
     {
-        User user = null;
-        if ( useUsersCache() )
-        {
-            user = (User) usersCache.get( GUEST_USERNAME );
-            if ( user != null )
-            {
-                return user;
-            }
-        }
-        UserNotFoundException lastException = null;
-        for ( UserManager userManager : userManagerPerId.values() )
-        {
-            try
-            {
-                user = userManager.getGuestUser();
-                if ( user != null )
-                {
-                    if ( useUsersCache() )
-                    {
-                        usersCache.put( user.getUsername(), user );
-                    }
-                    return user;
-                }
-            }
-            catch ( UserNotFoundException e )
-            {
-                lastException = e;
-            }
-        }
-
-        if ( user == null && lastException != null )
-        {
-            throw lastException;
-        }
-
-        return user;
+        return findUser( GUEST_USERNAME );
     }
 
     @Override