X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fshardstrategy%2FModuleShardStrategy.java;h=26cbc053f696192e61d895b9937d9b9066c09632;hb=30507b196fa240a4176ba12102ac0469280feff9;hp=e9ecf7eac30f3e64851e2225ad4a8838d02060e6;hpb=3c298061e7c22390eaf790aae977decfe0f94ad1;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java
index e9ecf7eac3..26cbc053f6 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java
@@ -8,8 +8,7 @@
 
 package org.opendaylight.controller.cluster.datastore.shardstrategy;
 
-import java.util.List;
-import org.opendaylight.controller.cluster.datastore.Configuration;
+import org.opendaylight.controller.cluster.datastore.config.Configuration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 public class ModuleShardStrategy implements ShardStrategy {
@@ -21,17 +20,12 @@ public class ModuleShardStrategy implements ShardStrategy {
 
     public ModuleShardStrategy(String moduleName, Configuration configuration){
         this.moduleName = moduleName;
-
         this.configuration = configuration;
     }
 
     @Override
     public String findShard(YangInstanceIdentifier path) {
-        List<String> shardNames =
-            configuration.getShardNamesFromModuleName(moduleName);
-        if (shardNames.isEmpty()) {
-            return DefaultShardStrategy.DEFAULT_SHARD;
-        }
-        return shardNames.get(0);
+        String shardName = configuration.getShardNameForModule(moduleName);
+        return shardName != null ? shardName : DefaultShardStrategy.DEFAULT_SHARD;
     }
 }