Merge pull request #697 from HCanber/revert-parts-of-691

Revert parts of #691 "refactor suspend children"
akkadotnet · Mar 1, 2015 · a4c1ada · a4c1ada · Petabridge-CI · Mar 1, 2015
2 parents df0c021 + b509686
commit a4c1ada
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/src/core/Akka/Actor/ActorCell.Children.cs b/src/core/Akka/Actor/ActorCell.Children.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using Akka.Actor.Internal;
 using Akka.Util;
@@ -198,12 +197,23 @@ protected void SetTerminated()
         /// </summary>
         private void SuspendChildren(List<ActorRef> exceptFor = null)
         {
-            var except = exceptFor ?? Enumerable.Empty<ActorRef>();
-            (from s in ChildrenContainer.Stats
-             where !except.Contains(s.Child)
-             select s.Child)
-            .ToList()
-            .ForEach(c => c.Suspend());
+            if (exceptFor == null)
+            {
+                foreach (var stats in ChildrenContainer.Stats)
+                {
+                    var child = stats.Child;
+                    child.Suspend();
+                }
+            }
+            else
+            {
+                foreach (var stats in ChildrenContainer.Stats)
+                {
+                    var child = stats.Child;
+                    if (!exceptFor.Contains(child))
+                        child.Suspend();
+                }
+            }
         }
 
         /// <summary>