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

[olamy]

Author: olamy
Date: Mon Jan 21 16:36:55 2013
New Revision: 1436467

URL: http://svn.apache.org/viewvc?rev=1436467&view=rev
Log:
no need to read the configuration every time

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=1436467&r1=1436466&r2=1436467&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
 Mon Jan 21 16:36:55 2013
@@ -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,8 +58,10 @@ public class ArchivaConfigurableUsersMan
     private List<UserManagerListener> listeners = new 
ArrayList<UserManagerListener>();
 
     @Inject
-    @Named(value = "cache#users")
-    private Cache<String,User> usersCache;
+    @Named( value = "cache#users" )
+    private Cache<String, User> usersCache;
+
+    private boolean useUsersCache;
 
     @Override
     public void initialize()
@@ -77,6 +79,8 @@ public class ArchivaConfigurableUsersMan
                 setUserManagerImpl( userManagerImpl );
                 userManagerPerId.put( id, userManagerImpl );
             }
+
+            this.useUsersCache = 
redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().isUseUsersCache();
         }
         catch ( RepositoryAdminException e )
         {
@@ -88,15 +92,7 @@ public class ArchivaConfigurableUsersMan
 
     protected boolean useUsersCache()
     {
-        try
-        {
-            return 
redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().isUseUsersCache();
-        }
-        catch ( RepositoryAdminException e )
-        {
-            log.warn( "skip fail to get RedbackRuntimeConfiguration: {}, use 
false", e.getMessage(), e );
-            return false;
-        }
+        return this.useUsersCache;
     }
 
     @Override