Fix IActorRef leaks in AddressTerminatedTopic when entity terminates …

…immediately after unwatching a remote actor. (#4305)
akkadotnet · Mar 9, 2020 · 9f2948a · 9f2948a
1 parent c0cec03
commit 9f2948a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/core/Akka/Actor/ActorCell.DeathWatch.cs b/src/core/Akka/Actor/ActorCell.DeathWatch.cs
@@ -173,7 +173,10 @@ protected void TellWatchersWeDied()
             }
             finally
             {
-                _state = _state.ClearWatching();
+                MaintainAddressTerminatedSubscription(() =>
+                {
+                    _state = _state.ClearWatchedBy();
+                });
             }
         }
 

diff --git a/src/core/Akka/ActorState.cs b/src/core/Akka/ActorState.cs
@@ -57,6 +57,11 @@ internal interface IActorState
         /// <returns>TBD</returns>
         IActorState ClearWatching();
         /// <summary>
+        /// Clears the `WatchedBy` set
+        /// </summary>
+        /// <returns>TBD</returns>
+        IActorState ClearWatchedBy();
+        /// <summary>
         /// Clears the `Termination queue` set
         /// </summary>
         /// <returns>TBD</returns>
@@ -308,6 +313,16 @@ public IActorState ClearWatching()
             return this;
         }
 
+        /// <summary>
+        /// TBD
+        /// </summary>
+        /// <returns>TBD</returns>
+        public IActorState ClearWatchedBy()
+        {
+            _watchedBy = null;
+            return this;
+        }
+
         /// <summary>
         /// TBD
         /// </summary>
@@ -536,6 +551,17 @@ public IActorState ClearWatching()
         }
 
 
+        /// <summary>
+        /// TBD
+        /// </summary>
+        /// <returns>TBD</returns>
+        public IActorState ClearWatchedBy()
+        {
+            _watchedBy.Clear();
+            return this;
+        }
+
+
         /// <summary>
         /// TBD
         /// </summary>