From 01004af457669346ac267df20d372e03852b4ea0 Mon Sep 17 00:00:00 2001 From: JhontSouth Date: Mon, 11 Nov 2024 08:47:49 -0500 Subject: [PATCH 1/2] add catch to capture 412 error in BlobsStorage --- libraries/Microsoft.Bot.Builder.Azure.Blobs/BlobsStorage.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/Microsoft.Bot.Builder.Azure.Blobs/BlobsStorage.cs b/libraries/Microsoft.Bot.Builder.Azure.Blobs/BlobsStorage.cs index b70aca8b21..f5d053c19a 100644 --- a/libraries/Microsoft.Bot.Builder.Azure.Blobs/BlobsStorage.cs +++ b/libraries/Microsoft.Bot.Builder.Azure.Blobs/BlobsStorage.cs @@ -290,6 +290,11 @@ internal BlobsStorage(BlobContainerClient containerClient, JsonSerializer jsonSe $"An error occurred while trying to write an object. The underlying '{BlobErrorCode.InvalidBlockList}' error is commonly caused due to concurrently uploading an object larger than 128MB in size.", ex); } + catch (RequestFailedException ex) + when (ex.Status == 412) + { + throw new InvalidOperationException($"Etag conflict: {ex.Message}"); + } } } From ea891826a3687c7e2f2d30da1de43bc6d70f415e Mon Sep 17 00:00:00 2001 From: JhontSouth Date: Mon, 11 Nov 2024 11:00:31 -0500 Subject: [PATCH 2/2] use HttpStatusCode --- libraries/Microsoft.Bot.Builder.Azure.Blobs/BlobsStorage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Microsoft.Bot.Builder.Azure.Blobs/BlobsStorage.cs b/libraries/Microsoft.Bot.Builder.Azure.Blobs/BlobsStorage.cs index f5d053c19a..44920b628a 100644 --- a/libraries/Microsoft.Bot.Builder.Azure.Blobs/BlobsStorage.cs +++ b/libraries/Microsoft.Bot.Builder.Azure.Blobs/BlobsStorage.cs @@ -291,7 +291,7 @@ internal BlobsStorage(BlobContainerClient containerClient, JsonSerializer jsonSe ex); } catch (RequestFailedException ex) - when (ex.Status == 412) + when (ex.Status == (int)HttpStatusCode.PreconditionFailed) { throw new InvalidOperationException($"Etag conflict: {ex.Message}"); }