From 643fe71d84282f4cc03a91f514376a9e9b3851f1 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Fri, 10 Apr 2015 17:08:06 -0400 Subject: [PATCH] Address comment in gerrit 17266 As per comment in https://git.opendaylight.org/gerrit/#/c/17266/ , moved check for snapshot messages to the else clause. Change-Id: I84405dfb6c832058a1bcc041a539748f4499dd8f Signed-off-by: Tom Pantelis --- .../opendaylight/controller/cluster/raft/RaftActor.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java index 1101af8442..4a2ab9936f 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java @@ -195,11 +195,6 @@ public abstract class RaftActor extends AbstractUntypedPersistentActor { @Override public void handleCommand(Object message) { - boolean handled = snapshotSupport.handleSnapshotMessage(message); - if(handled) { - return; - } - if (message instanceof ApplyState){ ApplyState applyState = (ApplyState) message; @@ -233,7 +228,7 @@ public abstract class RaftActor extends AbstractUntypedPersistentActor { ); } else if(message instanceof GetOnDemandRaftState) { onGetOnDemandRaftStats(); - } else { + } else if(!snapshotSupport.handleSnapshotMessage(message)) { reusableBehaviorStateHolder.init(getCurrentBehavior()); setCurrentBehavior(currentBehavior.handleMessage(getSender(), message)); -- 2.36.6