Reverted

added prune method
PrismLibrary · Jan 13, 2019 · 57ad662 · 57ad662
1 parent 9399b9d
commit 57ad662
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/Source/Prism.Tests/Events/PubSubEventFixture.cs b/Source/Prism.Tests/Events/PubSubEventFixture.cs
@@ -36,6 +36,7 @@ public void EnsureSubscriptionListIsEmptyAfterSubscribeAgainAMessage()
             SubscribeExternalActionWithoutReference(pubSubEvent);
             GC.Collect();
             SubscribeExternalActionWithoutReference(pubSubEvent);
+            pubSubEvent.Prune();
             Assert.True(pubSubEvent.BaseSubscriptions.Count == 1, "Subscriptionlist is empty");
         }
 

diff --git a/Source/Prism/Events/EventBase.cs b/Source/Prism/Events/EventBase.cs
@@ -1,6 +1,3 @@
-
-
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -45,7 +42,6 @@ protected virtual SubscriptionToken InternalSubscribe(IEventSubscription eventSu
 
             lock (Subscriptions)
             {
-                Prune();
                 Subscriptions.Add(eventSubscription);
             }
             return eventSubscription.SubscriptionToken;
@@ -97,26 +93,46 @@ public virtual bool Contains(SubscriptionToken token)
             }
         }
 
-        private void Prune()
+        private List<Action<object[]>> PruneAndReturnStrategies()
         {
+            List<Action<object[]>> returnList = new List<Action<object[]>>();
+
             lock (Subscriptions)
             {
                 for (var i = Subscriptions.Count - 1; i >= 0; i--)
                 {
-                    if (_subscriptions[i].GetExecutionStrategy() == null)
+                    Action<object[]> listItem =
+                        _subscriptions[i].GetExecutionStrategy();
+
+                    if (listItem == null)
                     {
+                        // Prune from main list. Log?
                         _subscriptions.RemoveAt(i);
                     }
+                    else
+                    {
+                        returnList.Add(listItem);
+                    }
                 }
             }
+
+            return returnList;
         }
 
-        private List<Action<object[]>> PruneAndReturnStrategies()
+        /// <summary>
+        /// Forces the PubSubEvent to remove any subscriptions that no longer have an execution strategy.
+        /// </summary>
+        public void Prune()
         {
             lock (Subscriptions)
             {
-                Prune();
-                return _subscriptions.Select(x => x.GetExecutionStrategy()).ToList();
+                for (var i = Subscriptions.Count - 1; i >= 0; i--)
+                {
+                    if (_subscriptions[i].GetExecutionStrategy() == null)
+                    {
+                        _subscriptions.RemoveAt(i);
+                    }
+                }
             }
         }
     }