yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensures that any instances created with the ManyObjectsResolverBase that have an HTTP lifetime are disposed of at the end of the request

Browse Source
This commit is contained in:
Shannon
2015-01-16 17:24:47 +11:00
parent 16f63b7fd9
commit c853263894
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
View File

@@ -237,7 +237,14 @@ namespace Umbraco.Core.ObjectResolution
// create new instances per HttpContext
if (CurrentHttpContext.Items[_httpContextKey] == null)
{
CurrentHttpContext.Items[_httpContextKey] = CreateInstances().ToArray();
var instances = CreateInstances().ToArray();
var disposableInstances = instances.OfType<IDisposable>();
//Ensure anything resolved that is IDisposable is disposed when the request termintates
foreach (var disposable in disposableInstances)
{
CurrentHttpContext.DisposeOnPipelineCompleted(disposable);
}
CurrentHttpContext.Items[_httpContextKey] = instances;
}
return (TResolved[])CurrentHttpContext.Items[_httpContextKey];