#375 Cleanup code

Author: Ben de Bruyn

src/Docker.DotNet/Endpoints/StreamUtil.cs

@@ -14,15 +14,12 @@ internal static async Task MonitorStreamAsync(Task<Stream> streamTask, DockerCli
             using (var stream = await streamTask)
             {
                 // ReadLineAsync must be cancelled by closing the whole stream.
-                //using (cancel.Register(() => stream.Dispose()))
+                using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
                 {
-                    using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
+                    string line;
+                    while ((line = await reader.ReadLineAsync()) != null && !cancel.IsCancellationRequested)
                     {
-                        string line;
-                        while ((line = await reader.ReadLineAsync()) != null && !cancel.IsCancellationRequested)
-                        {
-                            progress.Report(line);
-                        }
+                        progress.Report(line);
                     }
                 }
             }
@@ -33,27 +30,24 @@ internal static async Task MonitorStreamForMessagesAsync<T>(Task<Stream> streamT
             using (var stream = await streamTask)
             {
                 // ReadLineAsync must be cancelled by closing the whole stream.
-                //using (cancel.Register(() => stream.Dispose()))
+                using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
                 {
-                    using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
+                    string line;
+                    try
                     {
-                        string line;
-                        try
+                        while ((line = await reader.ReadLineAsync()) != null && !cancel.IsCancellationRequested)
                         {
-                            while ((line = await reader.ReadLineAsync()) != null && !cancel.IsCancellationRequested)
-                            {
-                                var prog = client.JsonSerializer.DeserializeObject<T>(line);
-                                if (prog == null) continue;
+                            var prog = client.JsonSerializer.DeserializeObject<T>(line);
+                            if (prog == null) continue;
 
-                                progress.Report(prog);
-                            }
-                        }
-                        catch (ObjectDisposedException)
-                        {
-                            // The subsequent call to reader.ReadLineAsync() after cancellation
-                            // will fail because we disposed the stream. Just ignore here.
+                            progress.Report(prog);
                         }
                     }
+                    catch (ObjectDisposedException)
+                    {
+                        // The subsequent call to reader.ReadLineAsync() after cancellation
+                        // will fail because we disposed the stream. Just ignore here.
+                    }
                 }
             }
         }