aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Server.Implementations')
-rw-r--r--MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs13
1 files changed, 5 insertions, 8 deletions
diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs b/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs
index 43b1e693c..9e4a45253 100644
--- a/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs
+++ b/MediaBrowser.Server.Implementations/Devices/DeviceRepository.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Server.Implementations.Devices
private readonly ILogger _logger;
private readonly IFileSystem _fileSystem;
- private ConcurrentBag<DeviceInfo> _devices;
+ private List<DeviceInfo> _devices;
public DeviceRepository(IApplicationPaths appPaths, IJsonSerializer json, ILogger logger, IFileSystem fileSystem)
{
@@ -93,17 +93,14 @@ namespace MediaBrowser.Server.Implementations.Devices
public IEnumerable<DeviceInfo> GetDevices()
{
- if (_devices == null)
+ lock (_syncLock)
{
- lock (_syncLock)
+ if (_devices == null)
{
- if (_devices == null)
- {
- _devices = new ConcurrentBag<DeviceInfo>(LoadDevices());
- }
+ _devices = LoadDevices().ToList();
}
+ return _devices.ToList();
}
- return _devices.ToList();
}
private IEnumerable<DeviceInfo> LoadDevices()