diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-19 15:35:53 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-19 15:35:53 -0400 |
| commit | 3037c18e3105eec1b9fd1d1a35e6c41b2c7c384a (patch) | |
| tree | 09323eb675b238817eb28b72cf7c331de3926ece | |
| parent | c233f2190c8d71508b5de40c18ad21d245a10de4 (diff) | |
made folder sync lock protected
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 80c29f624..5b90382b6 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -134,7 +134,7 @@ namespace MediaBrowser.Controller.Entities { List<BaseItem> newChildren; - lock (_childrenSyncLock) + lock (ChildrenSyncLock) { newChildren = _children.ToList(); @@ -477,7 +477,7 @@ namespace MediaBrowser.Controller.Entities /// <summary> /// The _children sync lock /// </summary> - private object _childrenSyncLock = new object(); + protected object ChildrenSyncLock = new object(); /// <summary> /// Gets or sets the actual children. /// </summary> @@ -486,7 +486,7 @@ namespace MediaBrowser.Controller.Entities { get { - LazyInitializer.EnsureInitialized(ref _children, ref _childrenInitialized, ref _childrenSyncLock, LoadChildrenInternal); + LazyInitializer.EnsureInitialized(ref _children, ref _childrenInitialized, ref ChildrenSyncLock, LoadChildrenInternal); return _children; } } @@ -711,7 +711,7 @@ namespace MediaBrowser.Controller.Entities if (actualRemovals.Count > 0) { - lock (_childrenSyncLock) + lock (ChildrenSyncLock) { _children = new ConcurrentBag<BaseItem>(_children.Except(actualRemovals)); } |