1 files changed, 1 insertions, 10 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java
index 0bb33595e5..9f0f8b7113 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java
@@ -17,22 +17,13 @@
 package org.onap.config.api;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.ServiceLoader;
 
 public interface ConfigurationManager extends Configuration {
 
-    Configuration CONFIG = lookup();
+    Configuration CONFIG = ConfigurationLoader.load();
 
     static Configuration lookup() {
-
-        if (CONFIG == null) {
-            ServiceLoader<ConfigurationManager> loader = ServiceLoader.load(ConfigurationManager.class);
-            Iterator<ConfigurationManager> configManagers = loader.iterator();
-            return configManagers.hasNext() ? configManagers.next() : null;
-        }
-
         return CONFIG;
     }