From: tpantelis <tpanteli@brocade.com>
Date: Wed, 11 Feb 2015 07:43:28 +0000 (-0500)
Subject: InstallSnapshot does not pass the term to the protobuff instance
X-Git-Tag: release/lithium~533^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=6f7c3002cea8ddaafaf8e3ac57f66dff92d3d132

InstallSnapshot does not pass the term to the protobuff instance

Change-Id: If84d7ddc81fd1ea154477fe9795bba9e748af24c
Signed-off-by: tpantelis <tpanteli@brocade.com>
---

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java
index 119b43ce83..13636f36d7 100644
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java
@@ -73,6 +73,7 @@ public class InstallSnapshot extends AbstractRaftRPC {
 
     public <T extends Object> Object toSerializable(){
         InstallSnapshotMessages.InstallSnapshot.Builder builder = InstallSnapshotMessages.InstallSnapshot.newBuilder()
+                .setTerm(this.getTerm())
                 .setLeaderId(this.getLeaderId())
                 .setChunkIndex(this.getChunkIndex())
                 .setData(this.getData())
diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java
index 7c37cbc502..02c391f146 100644
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java
@@ -424,8 +424,7 @@ public class LeaderTest extends AbstractRaftActorBehaviorTest {
         assertEquals(snapshotIndex, installSnapshot.getLastIncludedIndex());
         assertEquals(snapshotTerm, installSnapshot.getLastIncludedTerm());
 
-        // FIXME - we don't set the term in the serialized message.
-        //assertEquals(currentTerm, installSnapshot.getTerm());
+        assertEquals(currentTerm, installSnapshot.getTerm());
     }
 
     @Test