From: Robert Varga Date: Wed, 30 Mar 2016 14:50:55 +0000 (+0200) Subject: Do not allow RaftActorBehavior.close() to throw Exception X-Git-Tag: release/boron~261 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=6f55265c68cbd7e231b48cfb1e6a2313d6680285 Do not allow RaftActorBehavior.close() to throw Exception No implementation uses the ability to throw here, disallow it in API contract. Change-Id: I8560e60a7cab06f221ff7382f9c205d967efcfe5 Signed-off-by: Robert Varga --- diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Candidate.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Candidate.java index 612c327aeb..72e8e8c2a7 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Candidate.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Candidate.java @@ -192,7 +192,8 @@ public class Candidate extends AbstractRaftActorBehavior { } } - @Override public void close() throws Exception { + @Override + public void close() { stopElection(); } } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java index 33ed3357d8..f483f0199e 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java @@ -427,7 +427,7 @@ public class Follower extends AbstractRaftActorBehavior { } @Override - public void close() throws Exception { + public void close() { stopElection(); } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/RaftActorBehavior.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/RaftActorBehavior.java index b0a7638b92..e7f43c898c 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/RaftActorBehavior.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/RaftActorBehavior.java @@ -74,4 +74,7 @@ public interface RaftActorBehavior extends AutoCloseable{ * @return The new behavior */ RaftActorBehavior switchBehavior(RaftActorBehavior behavior); + + @Override + void close(); }