Merge pull request #419 from jellyfin/dev

Master 10.0.0

1 files changed, 4 insertions, 8 deletions

diff --git a/Emby.Server.Implementations/Serialization/JsonSerializer.cs b/Emby.Server.Implementations/Serialization/JsonSerializer.cs
index 26371d21d..e28acd769 100644
--- a/Emby.Server.Implementations/Serialization/JsonSerializer.cs
+++ b/Emby.Server.Implementations/Serialization/JsonSerializer.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Serialization;
 using System.Threading.Tasks;
 
@@ -69,7 +69,7 @@ namespace Emby.Common.Implementations.Serialization
 
         private Stream OpenFile(string path)
         {
-            //_logger.Debug("Deserializing file {0}", path);
+            //_logger.LogDebug("Deserializing file {0}", path);
             return new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 131072);
         }
 
@@ -136,19 +136,15 @@ namespace Emby.Common.Implementations.Serialization
             return ServiceStack.Text.JsonSerializer.DeserializeFromStream<T>(stream);
         }
 
-        public async Task<T> DeserializeFromStreamAsync<T>(Stream stream)
+        public Task<T> DeserializeFromStreamAsync<T>(Stream stream)
         {
             if (stream == null)
             {
                 throw new ArgumentNullException("stream");
             }
 
-            using (var reader = new StreamReader(stream))
-            {
-                var json = await reader.ReadToEndAsync().ConfigureAwait(false);
 
-                return ServiceStack.Text.JsonSerializer.DeserializeFromString<T>(json);
-            }
+            return ServiceStack.Text.JsonSerializer.DeserializeFromStreamAsync<T>(stream);
         }
 
         /// <summary>