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

U4-6147 - repositories are not disposable (in progress)

Browse Source
This commit is contained in:
Stephan
2016-04-29 10:53:19 +02:00
parent 8ab61039ed
commit 578cb6eafb
38 changed files with 1678 additions and 1784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Umbraco.Core/Services/FileService.cs
View File

@@ -682,9 +682,9 @@ namespace Umbraco.Core.Services
}
}
var uow = _fileUowProvider.GetUnitOfWork();
using (var repository = GetPartialViewRepository(partialViewType, uow))
using (var uow = _fileUowProvider.GetUnitOfWork())
{
var repository = uow.CreatePartialViewRepository(partialViewType);
repository.AddOrUpdate(partialView);
uow.Commit();
@@ -708,9 +708,9 @@ namespace Umbraco.Core.Services
private bool DeletePartialViewMacro(string path, PartialViewType partialViewType, int userId = 0)
{
var uow = _fileUowProvider.GetUnitOfWork();
using (var repository = GetPartialViewRepository(partialViewType, uow))
{
using (var uow = _fileUowProvider.GetUnitOfWork())
{
var repository = uow.CreatePartialViewRepository(partialViewType);
var partialView = repository.Get(path);
if (partialView == null)
return true;
@@ -745,9 +745,9 @@ namespace Umbraco.Core.Services
if (SavingPartialView.IsRaisedEventCancelled(new SaveEventArgs<IPartialView>(partialView), this))
return Attempt<IPartialView>.Fail();
var uow = _fileUowProvider.GetUnitOfWork();
using (var repository = GetPartialViewRepository(partialViewType, uow))
using (var uow = _fileUowProvider.GetUnitOfWork())
{
var repository = uow.CreatePartialViewRepository(partialViewType);
repository.AddOrUpdate(partialView);
uow.Commit();
}
@@ -796,18 +796,6 @@ namespace Umbraco.Core.Services
: Attempt<string>.Fail();
}
private IPartialViewRepository GetPartialViewRepository(PartialViewType partialViewType, IUnitOfWork uow)
{
switch (partialViewType)
{
case PartialViewType.PartialView:
return uow.CreateRepository<IPartialViewRepository>();
case PartialViewType.PartialViewMacro:
return uow.CreateRepository<IPartialViewMacroRepository>();
}
throw new ArgumentOutOfRangeException("partialViewType");
}
#endregion
private void Audit(AuditType type, string message, int userId, int objectId)