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%2Fmessages%2FShardLeaderStateChanged.java;h=0b3b6b89186e415dba9c6e45c72c0d601fff41b3;hb=7a38f0591bc527178510d749ae361e317dcc9788;hp=20b7d818e315fc60b018e0c6e79082a11036b1e7;hpb=a89f83014714207a4ccb704eb75050d758266d71;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java
index 20b7d818e3..0b3b6b8918 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java
@@ -7,9 +7,10 @@
  */
 package org.opendaylight.controller.cluster.datastore.messages;
 
-import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import java.util.Optional;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.opendaylight.controller.cluster.notifications.LeaderStateChanged;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
 
@@ -22,15 +23,22 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
  */
 public class ShardLeaderStateChanged extends LeaderStateChanged {
 
-    private final Optional<DataTree> localShardDataTree;
+    private final DataTree localShardDataTree;
 
-    public ShardLeaderStateChanged(@Nonnull String memberId, @Nonnull String leaderId,
-            @Nonnull Optional<DataTree> localShardDataTree, short leaderPayloadVersion) {
+    public ShardLeaderStateChanged(@Nonnull String memberId, @Nullable String leaderId,
+            @Nonnull DataTree localShardDataTree, short leaderPayloadVersion) {
         super(memberId, leaderId, leaderPayloadVersion);
         this.localShardDataTree = Preconditions.checkNotNull(localShardDataTree);
     }
 
-    public @Nonnull Optional<DataTree> getLocalShardDataTree() {
-        return localShardDataTree;
+    public ShardLeaderStateChanged(@Nonnull String memberId, @Nullable String leaderId,
+            short leaderPayloadVersion) {
+        super(memberId, leaderId, leaderPayloadVersion);
+        this.localShardDataTree = null;
+    }
+
+    @Nonnull
+    public Optional<DataTree> getLocalShardDataTree() {
+        return Optional.ofNullable(localShardDataTree);
     }
 }