From d34cb445650979b4d7f2e82e70666a4fd9072671 Mon Sep 17 00:00:00 2001
From: fraliv13 <5892139+fraliv13@users.noreply.github.com>
Date: Fri, 13 Oct 2023 10:36:32 +0300
Subject: [PATCH 1/3] bump

---
 src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs b/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs
index b9b32eb3..3b498982 100644
--- a/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs
+++ b/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs
@@ -67,7 +67,7 @@ public void ScheduleRestart(TimeSpan delay = default)
                     await Task.Delay(delay);
 
                     if (!ExecutionContext.IsFlowSuppressed())
-                        ExecutionContext.SuppressFlow();
+                        ExecutionContext.SuppressFlow(); 
 
                     await TryStopAsync();
                     await StartAsync();

From dd6259f766a2eaf049b820a9b54fadf7ea363529 Mon Sep 17 00:00:00 2001
From: fraliv13 <5892139+fraliv13@users.noreply.github.com>
Date: Fri, 13 Oct 2023 11:05:41 +0300
Subject: [PATCH 2/3] Moved suppressflow

---
 .../NBB.Messaging.Host/Internal/MessagingHost.cs       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs b/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs
index 3b498982..2c8de5c3 100644
--- a/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs
+++ b/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs
@@ -60,15 +60,15 @@ public void ScheduleRestart(TimeSpan delay = default)
                 return;
 
             _logger.LogInformation($"Messaging host is scheduled for restart in {delay.TotalSeconds} seconds");
+
+            if (!ExecutionContext.IsFlowSuppressed())
+                ExecutionContext.SuppressFlow();
+
             Task.Run(async () =>
             {
                 try
                 {
-                    await Task.Delay(delay);
-
-                    if (!ExecutionContext.IsFlowSuppressed())
-                        ExecutionContext.SuppressFlow(); 
-
+                    await Task.Delay(delay);                
                     await TryStopAsync();
                     await StartAsync();
                 }

From 89405d04de6634091eeee181936b21733fe33b5d Mon Sep 17 00:00:00 2001
From: fraliv13 <5892139+fraliv13@users.noreply.github.com>
Date: Fri, 13 Oct 2023 12:12:04 +0300
Subject: [PATCH 3/3] Restore context

---
 .../NBB.Messaging.Host/Internal/MessagingHost.cs          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs b/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs
index 2c8de5c3..a2dc303a 100644
--- a/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs
+++ b/src/Messaging/NBB.Messaging.Host/Internal/MessagingHost.cs
@@ -60,15 +60,15 @@ public void ScheduleRestart(TimeSpan delay = default)
                 return;
 
             _logger.LogInformation($"Messaging host is scheduled for restart in {delay.TotalSeconds} seconds");
-
-            if (!ExecutionContext.IsFlowSuppressed())
-                ExecutionContext.SuppressFlow();
+           
+            using IDisposable _ = ExecutionContext.IsFlowSuppressed() ? null : ExecutionContext.SuppressFlow();
 
             Task.Run(async () =>
             {
                 try
                 {
-                    await Task.Delay(delay);                
+                    await Task.Delay(delay);
+
                     await TryStopAsync();
                     await StartAsync();
                 }