From 49f3024ee0a621729e31279f8b2d46051fc003f1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 8 Jun 2019 00:44:58 +0200 Subject: [PATCH 1/1] Simplify recoveryTime computation Stopwatch.stop() returns self, take advantage of that to shorted the code to compute the formatting string. Also drop toString() call, as it is implied by string concat. Change-Id: I4fa645e42fc38b5f9f0775d986fd17aa693725b1 Signed-off-by: Robert Varga --- .../controller/cluster/raft/RaftActorRecoverySupport.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java index 283aa8f142..873b8514a2 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java @@ -246,11 +246,12 @@ class RaftActorRecoverySupport { endCurrentLogRecoveryBatch(); } - String recoveryTime = ""; + final String recoveryTime; if (recoveryTimer != null) { - recoveryTimer.stop(); - recoveryTime = " in " + recoveryTimer.toString(); + recoveryTime = " in " + recoveryTimer.stop(); recoveryTimer = null; + } else { + recoveryTime = ""; } log.info("{}: Recovery completed {} - Switching actor to Follower - last log index = {}, last log term = {}, " -- 2.36.6