Author: brett
Date: Wed Aug 22 07:15:38 2007
New Revision: 568618
URL: http://svn.apache.org/viewvc?rev=568618&view=rev
Log:
fix the test cases - we should be synchronizing on the current class, not the
configuration object itself
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?rev=568618&r1=568617&r2=568618&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
Wed Aug 22 07:15:38 2007
@@ -186,8 +186,8 @@
if ( configuration.getDatabaseScanning() != null )
{
- configuration.getDatabaseScanning().setCronExpression(
escapeCronExpression(
- configuration.getDatabaseScanning().getCronExpression() ) );
+ configuration.getDatabaseScanning().setCronExpression(
+ escapeCronExpression(
configuration.getDatabaseScanning().getCronExpression() ) );
}
new ConfigurationRegistryWriter().write( configuration, section );
@@ -262,12 +262,9 @@
// nothing to do here
}
- public void afterConfigurationChange( Registry registry, String
propertyName, Object propertyValue )
+ public synchronized void afterConfigurationChange( Registry registry,
String propertyName, Object propertyValue )
{
- synchronized( configuration )
- {
- configuration = null;
- }
+ configuration = null;
}
private String removeExpressions( String directory )