Synchronized save() and afterConfigurationChange() in DefaultArchivaConfiguration.

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

diff --git a/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
index 376fac46da5bf4e7764077708a37a8fc4abb27da..7ed026b7bbd674c9da63d35727f225c7df35dd20 100644 (file)
--- a/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
@@ -137,7 +137,7 @@ public class DefaultArchivaConfiguration
         return registry.getSubset( KEY );
     }
 
-    public void save( Configuration configuration )
+    public synchronized void save( Configuration configuration )
         throws RegistryException, IndeterminateConfigurationException
     {
         Registry section = registry.getSection( KEY + ".user" );
@@ -264,7 +264,10 @@ public class DefaultArchivaConfiguration
 
     public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
-        configuration = null;
+        synchronized( configuration )
+        {
+            configuration = null;
+        }
     }
 
     private String removeExpressions( String directory )