From f1e170e9f0f1410f90bcd81f7e18aa8f83483367 Mon Sep 17 00:00:00 2001 From: ghik Date: Tue, 12 Jun 2018 11:24:39 +0200 Subject: [PATCH 1/2] using zero deadline instead of Deadline.now to avoid race condition --- .../avsystem/commons/redis/actor/ClusterMonitoringActor.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons-redis/src/main/scala/com/avsystem/commons/redis/actor/ClusterMonitoringActor.scala b/commons-redis/src/main/scala/com/avsystem/commons/redis/actor/ClusterMonitoringActor.scala index 307c3f5be..36e1a2c26 100644 --- a/commons-redis/src/main/scala/com/avsystem/commons/redis/actor/ClusterMonitoringActor.scala +++ b/commons-redis/src/main/scala/com/avsystem/commons/redis/actor/ClusterMonitoringActor.scala @@ -49,7 +49,7 @@ final class ClusterMonitoringActor( private val connections = new mutable.HashMap[NodeAddress, ActorRef] private val clients = new mutable.HashMap[NodeAddress, RedisNodeClient] private var state = Opt.empty[ClusterState] - private var suspendUntil = Deadline.now + private var suspendUntil = Deadline(Duration.Zero) private var scheduledRefresh = Opt.empty[Cancellable] private val seedFailures = new ArrayBuffer[Throwable] From d1b5dd4bb576466dc9ee7507871b733a0e947615 Mon Sep 17 00:00:00 2001 From: ghik Date: Tue, 12 Jun 2018 11:44:54 +0200 Subject: [PATCH 2/2] 1.24.1.1 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 5c034d191..d48a8a716 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "1.24.1" +version in ThisBuild := "1.24.1.1"