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

Add lock to scoped burdens to ensure only one instance is created per scope #547

Merged
merged 8 commits into from
Sep 15, 2020
Merged

Add lock to scoped burdens to ensure only one instance is created per scope #547

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4d2d047
Add lock to scoped burdens to ensure only one instance is created per…
generik0 Sep 8, 2020
e3b36b9
Add more frameworks tests
generik0 Sep 8, 2020
8523c76
Change lock to be on scope cache, as that is what is getting more tha…
generik0 Sep 8, 2020
c4de0a7
Make the creation of the instances thread safe for scope and transient
generik0 Sep 9, 2020
76d1d0f
Remove netframeworks, net461 is good enough, but keep netcoreapp vers…
generik0 Sep 9, 2020
1fc06aa
Change to VS2019 image
generik0 Sep 9, 2020
4688ba5
Ensure that transient caches to itself and scoped to model
generik0 Sep 9, 2020
5efe94c
Improve code readability
generik0 Sep 13, 2020
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
2 changes: 1 addition & 1 deletion ...ions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net461;net471;net48</TargetFrameworks>
jonorossi marked this conversation as resolved.
Show resolved Hide resolved

<IsPackable>false</IsPackable>

Expand Down
7 changes: 3 additions & 4 deletions src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ internal class ExtensionContainerScope : ILifetimeScope, IDisposable
protected static readonly AsyncLocal<ExtensionContainerScope> current = new AsyncLocal<ExtensionContainerScope>();
private readonly ExtensionContainerScope parent;
private readonly IScopeCache scopeCache;

protected ExtensionContainerScope(ExtensionContainerScope parent)
{
scopeCache = new ScopeCache();
Expand Down Expand Up @@ -69,15 +69,14 @@ public Burden GetCachedInstance(ComponentModel model, ScopedInstanceActivationCa
scopeCache[burden] = burden;
jonorossi marked this conversation as resolved.
Show resolved Hide resolved
return burden;
}
else
lock (scopeCache)
{
var burden = scopeCache[model];
if (burden == null)
{
scopeCache[model] = burden = createInstance((_) => {});
}

return burden;
return burden;
}
}

Expand Down