From 6b74b75b6fccf15b6f4684fd1d200d94e4e92fcd Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Fri, 22 Mar 2013 14:08:20 -0100 Subject: [PATCH] Adding a few checks to ensure that we don't try to bulk save an empty list --- src/Umbraco.Core/Services/PackagingService.cs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs index 8a22c9bda5..dd50757586 100644 --- a/src/Umbraco.Core/Services/PackagingService.cs +++ b/src/Umbraco.Core/Services/PackagingService.cs @@ -65,7 +65,8 @@ namespace Umbraco.Core.Services select doc; var contents = ParseDocumentRootXml(roots, parentId); - _contentService.Save(contents, userId); + if(contents.Any()) + _contentService.Save(contents, userId); return contents; } @@ -76,7 +77,8 @@ namespace Umbraco.Core.Services //This is a single doc import var elements = new List { element }; var contents = ParseDocumentRootXml(elements, parentId); - _contentService.Save(contents, userId); + if (contents.Any()) + _contentService.Save(contents, userId); return contents; } @@ -505,10 +507,12 @@ namespace Umbraco.Core.Services } var list = dataTypes.Select(x => x.Value).ToList(); - _dataTypeService.Save(list, userId); - - SavePrevaluesFromXml(list, dataTypeElements); + if (list.Any()) + { + _dataTypeService.Save(list, userId); + SavePrevaluesFromXml(list, dataTypeElements); + } return list; } @@ -609,7 +613,9 @@ namespace Umbraco.Core.Services templates.Add(template); } - _fileService.SaveTemplate(templates, userId); + if(templates.Any()) + _fileService.SaveTemplate(templates, userId); + return templates; }