From 426016a923c1cca99941749c2747493bf4ba5550 Mon Sep 17 00:00:00 2001 From: Raffaele Aldrigo Date: Wed, 12 Dec 2018 14:59:29 +0100 Subject: [PATCH] progress can be null in CreateImageAsync --- src/Docker.DotNet/Endpoints/ImageOperations.cs | 4 ++-- src/Docker.DotNet/Endpoints/StreamUtil.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Docker.DotNet/Endpoints/ImageOperations.cs b/src/Docker.DotNet/Endpoints/ImageOperations.cs index 7468c1ef3..5b97f8ef5 100644 --- a/src/Docker.DotNet/Endpoints/ImageOperations.cs +++ b/src/Docker.DotNet/Endpoints/ImageOperations.cs @@ -60,12 +60,12 @@ internal ImageOperations(DockerClient client) return this._client.MakeRequestForStreamAsync(this._client.NoErrorHandlers, HttpMethod.Post, "build", queryParameters, data, cancellationToken); } - public Task CreateImageAsync(ImagesCreateParameters parameters, AuthConfig authConfig, IProgress progress, CancellationToken cancellationToken = default(CancellationToken)) + public Task CreateImageAsync(ImagesCreateParameters parameters, AuthConfig authConfig, IProgress progress = null, CancellationToken cancellationToken = default(CancellationToken)) { return CreateImageAsync(parameters, null, authConfig, progress, cancellationToken); } - public Task CreateImageAsync(ImagesCreateParameters parameters, Stream imageStream, AuthConfig authConfig, IProgress progress, CancellationToken cancellationToken = default(CancellationToken)) + public Task CreateImageAsync(ImagesCreateParameters parameters, Stream imageStream, AuthConfig authConfig, IProgress progress = null, CancellationToken cancellationToken = default(CancellationToken)) { if (parameters == null) { diff --git a/src/Docker.DotNet/Endpoints/StreamUtil.cs b/src/Docker.DotNet/Endpoints/StreamUtil.cs index e2ce954c1..2baf6ae59 100644 --- a/src/Docker.DotNet/Endpoints/StreamUtil.cs +++ b/src/Docker.DotNet/Endpoints/StreamUtil.cs @@ -45,7 +45,8 @@ internal static async Task MonitorStreamForMessagesAsync(Task streamT var prog = client.JsonSerializer.DeserializeObject(line); if (prog == null) continue; - progress.Report(prog); + if(progress!= null) + progress.Report(prog); } } catch (ObjectDisposedException)