diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-06 10:59:40 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-06 10:59:40 -0500 |
| commit | 9f4f2281cdd9d3cdbb9b96c19b8034f235b36b80 (patch) | |
| tree | 4f24e3b92359c468cc55d712f9cb6b3c014b8b35 /MediaBrowser.Server.Implementations/Providers | |
| parent | 5f0d8000a5ec26fd66c5f188f3bb517bb139b74b (diff) | |
prevent xml savers from triggering xml providers
Diffstat (limited to 'MediaBrowser.Server.Implementations/Providers')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Providers/ProviderManager.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs index 7b2a038f4..fa0620082 100644 --- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs +++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs @@ -202,7 +202,7 @@ namespace MediaBrowser.Server.Implementations.Providers { if (item == null) { - throw new ArgumentNullException(); + throw new ArgumentNullException("item"); } cancellationToken.ThrowIfCancellationRequested(); @@ -213,12 +213,9 @@ namespace MediaBrowser.Server.Implementations.Providers _logger.Debug("Running {0} for {1}", provider.GetType().Name, item.Path ?? item.Name ?? "--Unknown--"); } - // This provides the ability to cancel just this one provider - var innerCancellationTokenSource = new CancellationTokenSource(); - try { - var changed = await provider.FetchAsync(item, force, CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, innerCancellationTokenSource.Token).Token).ConfigureAwait(false); + var changed = await provider.FetchAsync(item, force, cancellationToken).ConfigureAwait(false); if (changed) { @@ -247,10 +244,6 @@ namespace MediaBrowser.Server.Implementations.Providers return ItemUpdateType.Unspecified; } - finally - { - innerCancellationTokenSource.Dispose(); - } } /// <summary> |
