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%2Fshardmanager%2FShardManagerInfo.java;h=41a2afe19313964aedf75832d5e56ac8b0164e1b;hb=8e6e0aeb5ca474cb292aab6ca581e921b0a56489;hp=61f9c1ca719909f4951a140c1c25189949bd8c05;hpb=e7ce18361e9d6f2126525934f73438e9841e39bc;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java
index 61f9c1ca71..41a2afe193 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java
@@ -13,6 +13,7 @@ import akka.pattern.Patterns;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import java.util.List;
+import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
 import org.opendaylight.controller.cluster.raft.RaftState;
 import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean;
@@ -29,12 +30,12 @@ final class ShardManagerInfo extends AbstractMXBean implements ShardManagerInfoM
     private static final long ASK_TIMEOUT_MILLIS = 5000;
 
     private final ActorRef shardManager;
-    private final String memberName;
+    private final MemberName memberName;
 
     private volatile boolean syncStatus = false;
 
 
-    ShardManagerInfo(final ActorRef shardManager, final String memberName, final String name,
+    ShardManagerInfo(final ActorRef shardManager, final MemberName memberName, final String name,
         final String mxBeanType) {
         super(name, mxBeanType, JMX_CATEGORY_SHARD_MANAGER);
         this.shardManager = Preconditions.checkNotNull(shardManager);
@@ -63,7 +64,7 @@ final class ShardManagerInfo extends AbstractMXBean implements ShardManagerInfoM
 
     @Override
     public String getMemberName() {
-        return memberName;
+        return memberName.getName();
     }
 
     private void requestSwitchShardState(final ShardIdentifier shardId, final String newState, final long term) {
@@ -96,8 +97,7 @@ final class ShardManagerInfo extends AbstractMXBean implements ShardManagerInfoM
 
     @Override
     public void switchShardState(String shardId, String newState, long term) {
-        final ShardIdentifier identifier = ShardIdentifier.builder().fromShardIdString(
-                Preconditions.checkNotNull(shardId, "Shard id may not be null")).build();
+        final ShardIdentifier identifier = ShardIdentifier.fromShardIdString(shardId);
         LOG.info("switchShardState called shardName = {}, newState = {}, term = {}", shardId, newState, term);
         requestSwitchShardState(identifier, newState, term);
     }