improve httpclient resource disposal

1 files changed, 15 insertions, 9 deletions

diff --git a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
index 9aeaa8d1f1..c921df61ca 100644
--- a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
+++ b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
@@ -91,7 +91,7 @@ namespace MediaBrowser.Providers.People
 
             var url = string.Format(@"https://api.themoviedb.org/3/search/person?api_key={1}&query={0}", WebUtility.UrlEncode(searchInfo.Name), MovieDbProvider.ApiKey);
 
-            using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
@@ -99,10 +99,13 @@ namespace MediaBrowser.Providers.People
 
             }).ConfigureAwait(false))
             {
-                var result = _jsonSerializer.DeserializeFromStream<PersonSearchResults>(json) ??
-                             new PersonSearchResults();
+                using (var json = response.Content)
+                {
+                    var result = _jsonSerializer.DeserializeFromStream<PersonSearchResults>(json) ??
+                                 new PersonSearchResults();
 
-                return result.Results.Select(i => GetSearchResult(i, tmdbImageUrl));
+                    return result.Results.Select(i => GetSearchResult(i, tmdbImageUrl));
+                }
             }
         }
 
@@ -223,7 +226,7 @@ namespace MediaBrowser.Providers.People
 
             var url = string.Format(@"https://api.themoviedb.org/3/person/{1}?api_key={0}&append_to_response=credits,images,external_ids", MovieDbProvider.ApiKey, id);
 
-            using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
@@ -231,11 +234,14 @@ namespace MediaBrowser.Providers.People
 
             }).ConfigureAwait(false))
             {
-                _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(dataFilePath));
-
-                using (var fs = _fileSystem.GetFileStream(dataFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
+                using (var json = response.Content)
                 {
-                    await json.CopyToAsync(fs).ConfigureAwait(false);
+                    _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(dataFilePath));
+
+                    using (var fs = _fileSystem.GetFileStream(dataFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
+                    {
+                        await json.CopyToAsync(fs).ConfigureAwait(false);
+                    }
                 }
             }
         }