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/18 21:30:52 UTC
svn commit: r1447476 - in
/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin:
archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/
archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/rep...
Author: olamy
Date: Mon Feb 18 20:30:51 2013
New Revision: 1447476
URL: http://svn.apache.org/r1447476
Log:
this optimisation was very crappy in fact so remove it: too much synchronization were needed
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
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-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java?rev=1447476&r1=1447475&r2=1447476&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java Mon Feb 18 20:30:51 2013
@@ -118,10 +118,6 @@ public class RedbackRuntimeConfiguration
public List<PropertyEntry> getConfigurationPropertiesEntries()
{
- if ( configurationPropertiesEntries != null )
- {
- return configurationPropertiesEntries;
- }
configurationPropertiesEntries = new ArrayList<PropertyEntry>( getConfigurationProperties().size() );
for ( Map.Entry<String, String> entry : getConfigurationProperties().entrySet() )
{
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=1447476&r1=1447475&r2=1447476&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 Mon Feb 18 20:30:51 2013
@@ -55,7 +55,7 @@ import java.util.Set;
*/
@Service( "userConfiguration#archiva" )
public class DefaultRedbackRuntimeConfigurationAdmin
- implements RedbackRuntimeConfigurationAdmin, UserConfiguration, ConfigurationListener
+ implements RedbackRuntimeConfigurationAdmin, UserConfiguration
{
protected Logger log = LoggerFactory.getLogger( getClass() );
@@ -71,8 +71,6 @@ public class DefaultRedbackRuntimeConfig
@Named( value = "cache#users" )
private Cache usersCache;
- private volatile RedbackRuntimeConfiguration currentRedbackRuntimeConfiguration;
-
@PostConstruct
public void initialize()
throws UserConfigurationException
@@ -221,8 +219,6 @@ public class DefaultRedbackRuntimeConfig
updateRedbackRuntimeConfiguration( redbackRuntimeConfiguration );
}
- this.currentRedbackRuntimeConfiguration = redbackRuntimeConfiguration;
-
}
catch ( RepositoryAdminException e )
{
@@ -232,7 +228,7 @@ public class DefaultRedbackRuntimeConfig
public RedbackRuntimeConfiguration getRedbackRuntimeConfiguration()
{
- return build( archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration(), false );
+ return build( archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration() );
}
public void updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration )
@@ -245,7 +241,6 @@ public class DefaultRedbackRuntimeConfig
try
{
archivaConfiguration.save( configuration );
- this.currentRedbackRuntimeConfiguration = redbackRuntimeConfiguration;
}
catch ( RegistryException e )
{
@@ -258,12 +253,8 @@ public class DefaultRedbackRuntimeConfig
}
private RedbackRuntimeConfiguration build(
- org.apache.archiva.configuration.RedbackRuntimeConfiguration runtimeConfiguration, boolean force )
+ org.apache.archiva.configuration.RedbackRuntimeConfiguration runtimeConfiguration )
{
- if ( this.currentRedbackRuntimeConfiguration != null && !force )
- {
- return this.currentRedbackRuntimeConfiguration;
- }
RedbackRuntimeConfiguration redbackRuntimeConfiguration =
new BeanReplicator().replicateBean( runtimeConfiguration, RedbackRuntimeConfiguration.class );
@@ -294,8 +285,6 @@ public class DefaultRedbackRuntimeConfig
cleanupProperties( redbackRuntimeConfiguration );
- this.currentRedbackRuntimeConfiguration = redbackRuntimeConfiguration;
-
return redbackRuntimeConfiguration;
}
@@ -629,8 +618,5 @@ public class DefaultRedbackRuntimeConfig
return keysSet;
}
- public void configurationEvent( ConfigurationEvent event )
- {
- build( archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration(), true );
- }
+
}