reduce locking on folder children

2 files changed, 11 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 1bc3f1094..15eb182a3 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1346,7 +1346,16 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <returns>BaseItem.</returns>
         public BaseItem RetrieveItem(Guid id)
         {
-            return ItemRepository.RetrieveItem(id);
+            var item = ItemRepository.RetrieveItem(id);
+
+            var folder = item as Folder;
+
+            if (folder != null)
+            {
+                folder.LoadSavedChildren();
+            }
+
+            return item;
         }
 
         private readonly ConcurrentDictionary<string, SemaphoreSlim> _fileLocks = new ConcurrentDictionary<string, SemaphoreSlim>();
diff --git a/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs b/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs
index 8b98a6944..a6b13f8dd 100644
--- a/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs
+++ b/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <param name="args">The args.</param>
         public static void SetInitialItemValues(BaseItem item, ItemResolveArgs args)
         {
-            item.ResolveArgs = args;
+            item.ResetResolveArgs(args);
 
             // If the resolver didn't specify this
             if (string.IsNullOrEmpty(item.Path))