Handled not thread-safe fields in configuration

[sdc.git] / common / onap-common-configuration-management / onap-configuration-management-core / src / main / java / org / onap / config / impl / AggregateConfiguration.java

diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java
index 32a1902..e81d82b 100644 (file)
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java
@@ -35,10 +35,10 @@ import org.onap.config.type.ConfigurationMode;
 
 public final class AggregateConfiguration {
 
-    private final Map<String, Configuration> rootConfig = new HashMap<>();
-    private final Map<String, Configuration> unionConfig = new HashMap<>();
-    private final Map<String, Configuration> mergeConfig = new HashMap<>();
-    private final Map<String, Configuration> overrideConfig = new LinkedHashMap<>();
+    private final Map<String, Configuration> rootConfig = Collections.synchronizedMap(new HashMap<>());
+    private final Map<String, Configuration> unionConfig = Collections.synchronizedMap(new HashMap<>());
+    private final Map<String, Configuration> mergeConfig = Collections.synchronizedMap(new HashMap<>());
+    private final Map<String, Configuration> overrideConfig = Collections.synchronizedMap(new LinkedHashMap<>());
 
     public void addConfig(File file) throws Exception {
         addConfig(file.getAbsolutePath().toUpperCase(), ConfigurationUtils.getMergeStrategy(file),