Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 5.7 #381

Merged
merged 1 commit into from
Dec 9, 2022
+15 −6
Merged

Release 5.7 #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Docs/releases.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Releases

## New in 5.7
* Fixes memory leak when using `ActionSubscriber` or `SubscribeToAction` ([#378](https://github.com/mrpmorris/Fluxor/issues/378))

## New in 5.6
* Support .NET 7
* Ensure StateSelection unsubscribes properly ([#353](https://github.com/mrpmorris/Fluxor/issues/353))
Expand Down
18 changes: 12 additions & 6 deletions Source/Lib/Fluxor/ActionSubscriber.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using Fluxor.Extensions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;

namespace Fluxor
{
Expand All @@ -23,7 +21,7 @@ public void Notify(object action)
if (action is null)
throw new ArgumentNullException(nameof(action));

lock(SyncRoot)
lock (SyncRoot)
{
IEnumerable<Action<object>> callbacks =
SubscriptionsForType
Expand All @@ -48,7 +46,7 @@ public void SubscribeToAction<TAction>(object subscriber, Action<TAction> callba
actionType: typeof(TAction),
callback: (object action) => callback((TAction)action));

lock(SyncRoot)
lock (SyncRoot)
{
if (!SubscriptionsForInstance.TryGetValue(subscriber, out List<ActionSubscription> instanceSubscriptions))
{
Expand All @@ -72,17 +70,22 @@ public void UnsubscribeFromAllActions(object subscriber)
throw new ArgumentNullException(nameof(subscriber));

List<ActionSubscription> instanceSubscriptions;
lock(SyncRoot)
lock (SyncRoot)
{
if (!SubscriptionsForInstance.TryGetValue(subscriber, out instanceSubscriptions))
return;

IEnumerable<object> subscribedInstances =
instanceSubscriptions
.Select(x => x.Subscriber)
.Distinct();

IEnumerable<Type> subscribedActionTypes =
instanceSubscriptions
.Select(x => x.ActionType)
.Distinct();

foreach(Type actionType in subscribedActionTypes)
foreach (Type actionType in subscribedActionTypes)
{
List<ActionSubscription> actionTypeSubscriptions;
if (!SubscriptionsForType.TryGetValue(actionType, out actionTypeSubscriptions))
Expand All @@ -91,6 +94,9 @@ public void UnsubscribeFromAllActions(object subscriber)
.Except(instanceSubscriptions)
.ToList();
}

foreach (object subscription in subscribedInstances)
SubscriptionsForInstance.Remove(subscription);
}
}
}
Expand Down