From c274386ae1d71bb3004d69934076e1cf73508359 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 18 Jan 2017 18:14:56 +0100 Subject: [PATCH 1/1] Fix eclipse warnings Remove illegal @return for method with no return and untangle if/else block where if branch always returns. Change-Id: Iafe4eb1b016674375d0b25cd01fdc05068fa1196 Signed-off-by: Robert Varga --- .../cluster/raft/behaviors/AbstractLeader.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java index 1b3abffbb0..10c1a156f9 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java @@ -606,8 +606,6 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior { /** * This method checks if any update needs to be sent to the given follower. This includes append log entries, * sending next snapshot chunk, and initiating a snapshot. - * - * @return true if any update is sent, false otherwise */ private void sendUpdatesToFollower(String followerId, FollowerLogInformation followerLogInformation, boolean sendHeartbeat, boolean isHeartbeat) { @@ -740,16 +738,16 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior { // Note: sendSnapshotChunk will set the LeaderInstallSnapshotState. sendSnapshotChunk(followerActor, followerLogInfo); return true; - } else { - boolean captureInitiated = context.getSnapshotManager().captureToInstall(context.getReplicatedLog().last(), - this.getReplicatedToAllIndex(), followerId); - if (captureInitiated) { - followerLogInfo.setLeaderInstallSnapshotState(new LeaderInstallSnapshotState( - context.getConfigParams().getSnapshotChunkSize(), logName())); - } + } - return captureInitiated; + boolean captureInitiated = context.getSnapshotManager().captureToInstall(context.getReplicatedLog().last(), + this.getReplicatedToAllIndex(), followerId); + if (captureInitiated) { + followerLogInfo.setLeaderInstallSnapshotState(new LeaderInstallSnapshotState( + context.getConfigParams().getSnapshotChunkSize(), logName())); } + + return captureInitiated; } private boolean canInstallSnapshot(long nextIndex) { -- 2.36.6