Properly handle RequestVote in all states

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / main / java / org / opendaylight / controller / cluster / raft / RaftActorContextImpl.java

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java
index 1fdc3c628fcb659fd26074d307709c0b1726801b..845011a7e372548999c9b643d26630528543e473 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java
@@ -14,8 +14,6 @@ import akka.actor.ActorSystem;
 import akka.actor.Props;
 import akka.actor.UntypedActorContext;
 
 import akka.actor.Props;
 import akka.actor.UntypedActorContext;
 

-import java.util.concurrent.atomic.AtomicLong;
-

 public class RaftActorContextImpl implements RaftActorContext{
 
     private final ActorRef actor;
 public class RaftActorContextImpl implements RaftActorContext{
 
     private final ActorRef actor;


@@ -26,16 +24,16 @@ public class RaftActorContextImpl implements RaftActorContext{
 
     private final ElectionTerm termInformation;
 
 
     private final ElectionTerm termInformation;
 

-    private final AtomicLong commitIndex;
+    private long commitIndex;

 
 

-    private final AtomicLong lastApplied;
+    private long lastApplied;

 
     private final ReplicatedLog replicatedLog;
 
     public RaftActorContextImpl(ActorRef actor, UntypedActorContext context,
         String id,
 
     private final ReplicatedLog replicatedLog;
 
     public RaftActorContextImpl(ActorRef actor, UntypedActorContext context,
         String id,

-        ElectionTerm termInformation, AtomicLong commitIndex,
-        AtomicLong lastApplied, ReplicatedLog replicatedLog) {
+        ElectionTerm termInformation, long commitIndex,
+        long lastApplied, ReplicatedLog replicatedLog) {

         this.actor = actor;
         this.context = context;
         this.id = id;
         this.actor = actor;
         this.context = context;
         this.id = id;


@@ -65,14 +63,22 @@ public class RaftActorContextImpl implements RaftActorContext{
         return termInformation;
     }
 
         return termInformation;
     }
 

-    public AtomicLong getCommitIndex() {
+    public long getCommitIndex() {

         return commitIndex;
     }
 
         return commitIndex;
     }
 

-    public AtomicLong getLastApplied() {
+    @Override public void setCommitIndex(long commitIndex) {
+        this.commitIndex = commitIndex;
+    }
+
+    public long getLastApplied() {

         return lastApplied;
     }
 
         return lastApplied;
     }
 

+    @Override public void setLastApplied(long lastApplied) {
+        this.lastApplied = lastApplied;
+    }
+

     @Override public ReplicatedLog getReplicatedLog() {
         return replicatedLog;
     }
     @Override public ReplicatedLog getReplicatedLog() {
         return replicatedLog;
     }