X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardPeerAddressResolver.java;h=464fc7f53a5aeaf0443ce5afe79b047c53042e8e;hp=12fabbb6d2d0dda93dbfd6f9edfef7c19f510b0a;hb=2eddbcc5db186af5b5feacfe5d7056e2f3dccd38;hpb=c09dc45ec6f475fbb5398d6fec2182738e73483f

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardPeerAddressResolver.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardPeerAddressResolver.java
index 12fabbb6d2..464fc7f53a 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardPeerAddressResolver.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardPeerAddressResolver.java
@@ -80,6 +80,10 @@ class ShardPeerAddressResolver implements PeerAddressResolver {
 
     @Override
     public String resolve(String peerId) {
+        if(peerId == null) {
+            return null;
+        }
+
         ShardIdentifier shardId = ShardIdentifier.builder().fromShardIdString(peerId).build();
         return getShardActorAddress(shardId.getShardName(), shardId.getMemberName());
     }