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 67e5b28e5c..682e5b3382 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 @@ -437,15 +437,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`) =>