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%2FShardInformation.java;h=b2ac96e1641e81d9a7dd3430601840db2bdb0c4d;hb=2d60632f7cf63712e8357a3cf3fc40d83366e5e6;hp=8fc77acf96395f58cfe1d919a1fd3e8a598eba38;hpb=1c717bbf117d3486196a0fdd73ac650721f9c557;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardInformation.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardInformation.java
index 8fc77acf96..b2ac96e164 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardInformation.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardInformation.java
@@ -63,7 +63,7 @@ final class ShardInformation {
 
     private DatastoreContext datastoreContext;
     private Shard.AbstractBuilder<?, ?> builder;
-    private boolean isActiveMember = true;
+    private boolean activeMember = true;
 
     ShardInformation(final String shardName, final ShardIdentifier shardId,
             final Map<String, String> initialPeerAddresses, final DatastoreContext datastoreContext,
@@ -101,8 +101,8 @@ final class ShardInformation {
         return shardId;
     }
 
-    void setLocalDataTree(final Optional<DataTree> localShardDataTree) {
-        this.localShardDataTree = localShardDataTree;
+    void setLocalDataTree(final Optional<DataTree> dataTree) {
+        this.localShardDataTree = dataTree;
     }
 
     Optional<DataTree> getLocalShardDataTree() {
@@ -113,8 +113,8 @@ final class ShardInformation {
         return datastoreContext;
     }
 
-    void setDatastoreContext(final DatastoreContext datastoreContext, final ActorRef sender) {
-        this.datastoreContext = datastoreContext;
+    void setDatastoreContext(final DatastoreContext newDatastoreContext, final ActorRef sender) {
+        this.datastoreContext = newDatastoreContext;
         if (actor != null) {
             LOG.debug("Sending new DatastoreContext to {}", shardId);
             actor.tell(this.datastoreContext, sender);
@@ -233,10 +233,10 @@ final class ShardInformation {
         return false;
     }
 
-    boolean setLeaderId(final String leaderId) {
-        final boolean changed = !Objects.equals(this.leaderId, leaderId);
-        this.leaderId = leaderId;
-        if (leaderId != null) {
+    boolean setLeaderId(final String newLeaderId) {
+        final boolean changed = !Objects.equals(this.leaderId, newLeaderId);
+        this.leaderId = newLeaderId;
+        if (newLeaderId != null) {
             this.leaderAvailable = true;
         }
         notifyOnShardInitializedCallbacks();
@@ -265,11 +265,11 @@ final class ShardInformation {
     }
 
     boolean isActiveMember() {
-        return isActiveMember;
+        return activeMember;
     }
 
     void setActiveMember(final boolean isActiveMember) {
-        this.isActiveMember = isActiveMember;
+        this.activeMember = isActiveMember;
     }
 
     SchemaContext getSchemaContext() {