Replaced StreamReader.Peek()

Replaced Peek() function because of issue that occurs only in .net6.0 dotnet/runtime#68983 when downloading large object (e.g. 8000+ child objects)
FerdiMeijer · Jul 5, 2022 · 720e643 · 720e643
1 parent 0b972a1
commit 720e643
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Core/Core/Transports/Server.cs b/Core/Core/Transports/Server.cs
@@ -479,15 +479,15 @@ private async Task<bool> CopyObjects(List<string> hashes, ITransport targetTrans
       {
         using (var reader = new StreamReader(stream, Encoding.UTF8))
         {
-          while (reader.Peek() > 0)
+          string line;
+          while ((line = reader.ReadLine()) != null)
           {
             if (CancellationToken.IsCancellationRequested)
             {
               Queue = new ConcurrentQueue<(string, string, int)>();
               return false;
             }
 
-            var line = reader.ReadLine();
             var pcs = line.Split(new char[] { '\t' }, count: 2);
             targetTransport.SaveObject(pcs[0], pcs[1]);
 

diff --git a/Core/Core/Transports/ServerUtils/ServerAPI.cs b/Core/Core/Transports/ServerUtils/ServerAPI.cs
@@ -139,15 +139,14 @@ private async Task DownloadObjectsImpl(string streamId, List<string> objectIds,
       {
         using (var reader = new StreamReader(childrenStream, Encoding.UTF8))
         {
-          while (reader.Peek() > 0)
+          string line;
+          while ((line = reader.ReadLine()) != null)
           {
             if (CancellationToken.IsCancellationRequested)
               return;
 
-            var line = reader.ReadLine();
             var pcs = line.Split(new char[] { '\t' }, count: 2);
             onObjectCallback(pcs[0], pcs[1]);
-
           }
         }
       }