You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/02/13 21:21:54 UTC

svn commit: r1445900 - /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java

Author: olamy
Date: Wed Feb 13 20:21:54 2013
New Revision: 1445900

URL: http://svn.apache.org/r1445900
Log:
optimize a bit: no need to fully rebuild the bean if no change

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java?rev=1445900&r1=1445899&r2=1445900&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java Wed Feb 13 20:21:54 2013
@@ -69,6 +69,8 @@ public class DefaultRedbackRuntimeConfig
     @Named( value = "cache#users" )
     private Cache usersCache;
 
+    private RedbackRuntimeConfiguration currentRedbackRuntimeConfiguration;
+
     @PostConstruct
     public void initialize()
         throws UserConfigurationException
@@ -217,6 +219,8 @@ public class DefaultRedbackRuntimeConfig
                 updateRedbackRuntimeConfiguration( redbackRuntimeConfiguration );
             }
 
+            this.currentRedbackRuntimeConfiguration = redbackRuntimeConfiguration;
+
         }
         catch ( RepositoryAdminException e )
         {
@@ -239,6 +243,7 @@ public class DefaultRedbackRuntimeConfig
         try
         {
             archivaConfiguration.save( configuration );
+            this.currentRedbackRuntimeConfiguration = redbackRuntimeConfiguration;
         }
         catch ( RegistryException e )
         {
@@ -253,6 +258,10 @@ public class DefaultRedbackRuntimeConfig
     private RedbackRuntimeConfiguration build(
         org.apache.archiva.configuration.RedbackRuntimeConfiguration runtimeConfiguration )
     {
+        if ( this.currentRedbackRuntimeConfiguration != null )
+        {
+            return this.currentRedbackRuntimeConfiguration;
+        }
         RedbackRuntimeConfiguration redbackRuntimeConfiguration =
             new BeanReplicator().replicateBean( runtimeConfiguration, RedbackRuntimeConfiguration.class );
 
@@ -283,7 +292,9 @@ public class DefaultRedbackRuntimeConfig
 
         cleanupProperties( redbackRuntimeConfiguration );
 
-t         return redbackRuntimeConfiguration;
+        this.currentRedbackRuntimeConfiguration = redbackRuntimeConfiguration;
+
+        return redbackRuntimeConfiguration;
     }
 
     /**
@@ -307,13 +318,13 @@ t         return redbackRuntimeConfigura
         properties.remove( UserConfigurationKeys.LDAP_WRITABLE );
         properties.remove( UserConfigurationKeys.LDAP_GROUPS_USE_ROLENAME );
         // cleanup groups <-> role mapping
-        for ( Map.Entry<String, String> entry : new HashMap<String, String>( properties ).entrySet() )
-        {
-            if ( entry.getKey().startsWith( UserConfigurationKeys.LDAP_GROUPS_ROLE_START_KEY ) )
-            {
-                properties.remove( entry.getKey() );
-            }
-        }
+        /**for ( Map.Entry<String, String> entry : new HashMap<String, String>( properties ).entrySet() )
+         {
+         if ( entry.getKey().startsWith( UserConfigurationKeys.LDAP_GROUPS_ROLE_START_KEY ) )
+         {
+         properties.remove( entry.getKey() );
+         }
+         }*/
     }
 
     private org.apache.archiva.configuration.RedbackRuntimeConfiguration build(