From: Jakub Toth <jakub.toth@pantheon.tech>
Date: Mon, 4 Sep 2017 15:36:46 +0000 (+0200)
Subject: Bug 9056 - Class FileModuleShardConfigProvider does not load
X-Git-Tag: release/oxygen~108
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=dd377ac9e87d87178d608f4ea919893c55f72b7e

Bug 9056 - Class FileModuleShardConfigProvider does not load
configurations from classpath properly

Change-Id: I1944e2a3c035efcbbcddb3f0680b682c5286d907
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
---

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/FileModuleShardConfigProvider.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/FileModuleShardConfigProvider.java
index 3f65b59b73..ba28e5dc3a 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/FileModuleShardConfigProvider.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/FileModuleShardConfigProvider.java
@@ -47,7 +47,7 @@ public class FileModuleShardConfigProvider implements ModuleShardConfigProvider
             moduleShardsConfig = ConfigFactory.parseFile(moduleShardsFile);
         } else {
             LOG.warn("module shards configuration read from resource");
-            moduleShardsConfig = ConfigFactory.load(moduleShardsFile.getPath());
+            moduleShardsConfig = ConfigFactory.load(moduleShardsConfigPath);
         }
 
         Config modulesConfig = null;
@@ -56,7 +56,7 @@ public class FileModuleShardConfigProvider implements ModuleShardConfigProvider
             modulesConfig = ConfigFactory.parseFile(modulesFile);
         } else {
             LOG.warn("modules configuration read from resource");
-            modulesConfig = ConfigFactory.load(modulesFile.getPath());
+            modulesConfig = ConfigFactory.load(modulesConfigPath);
         }
 
         final Map<String, ModuleConfig.Builder> moduleConfigMap = readModuleShardsConfig(moduleShardsConfig);