From 0475c11a1b2fbdd54dc21ee6de2e57c892150a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Andr=C3=A9n?= <johan@markatta.com>
Date: Thu, 11 Jun 2020 17:00:51 +0200
Subject: [PATCH] Avoid loop when not flightrecording

---
 .../src/main/scala/akka/cluster/sharding/Shard.scala | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
index c7765aa331..99391d9449 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
+++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
@@ -587,11 +587,13 @@ private[akka] class Shard(
         storingStarts.mkString(", "),
         storingStops.mkString(", "))
 
-    storingStarts.foreach { entityId =>
-      flightRecorder.rememberEntityAdd(entityId)
-    }
-    storingStops.foreach { id =>
-      flightRecorder.rememberEntityRemove(id)
+    if (flightRecorder != NoOpShardingFlightRecorder) {
+      storingStarts.foreach { entityId =>
+        flightRecorder.rememberEntityAdd(entityId)
+      }
+      storingStops.foreach { id =>
+        flightRecorder.rememberEntityRemove(id)
+      }
     }
     val startTimeNanos = System.nanoTime()
     val update = RememberEntitiesShardStore.Update(started = storingStarts, stopped = storingStops)