From 1dc5b0a01985902a2d453ce86025d6eae1a2e876 Mon Sep 17 00:00:00 2001
From: Christopher Batey <christopher.batey@gmail.com>
Date: Thu, 28 Nov 2019 19:11:54 +0000
Subject: [PATCH] Avoid dead letter for rebalance timeout msg

---
 .../main/scala/akka/cluster/sharding/ShardCoordinator.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala
index 758f284b7a..71d10eb282 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala
+++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala
@@ -434,15 +434,15 @@ object ShardCoordinator {
       regions: Set[ActorRef],
       shuttingDownRegions: Set[ActorRef])
       extends Actor
-      with ActorLogging {
+      with ActorLogging
+      with Timers {
     import Internal._
 
     shuttingDownRegions.foreach(context.watch)
     regions.foreach(_ ! BeginHandOff(shard))
     var remaining = regions
 
-    import context.dispatcher
-    context.system.scheduler.scheduleOnce(handOffTimeout, self, ReceiveTimeout)
+    timers.startSingleTimer("hand-off-timeout", ReceiveTimeout, handOffTimeout)
 
     def receive = {
       case BeginHandOffAck(`shard`) =>