From fee2e6d0e84fe1c24cbe3cadc98aa018bdd9ddb5 Mon Sep 17 00:00:00 2001
From: Ismael Hamed <1279846+ismaelhamed@users.noreply.github.com>
Date: Wed, 28 Sep 2022 11:53:24 +0200
Subject: [PATCH] Fixes `WithSyncCircuitBreaker`

---
 src/core/Akka/Pattern/CircuitBreaker.cs | 40 ++++++-------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/src/core/Akka/Pattern/CircuitBreaker.cs b/src/core/Akka/Pattern/CircuitBreaker.cs
index 5f3691b24f8..cf0a0f00dd7 100644
--- a/src/core/Akka/Pattern/CircuitBreaker.cs
+++ b/src/core/Akka/Pattern/CircuitBreaker.cs
@@ -240,41 +240,19 @@ public Task WithCircuitBreaker<TState>(TState state, Func<TState, Task> body) =>
             CurrentState.InvokeState(state, body);
 
         /// <summary>
-        /// The failure will be recorded farther down.
+        /// Wraps invocations of asynchronous calls that need to be protected.
         /// </summary>
-        /// <param name="body">TBD</param>
-        public void WithSyncCircuitBreaker(Action body)
-        {
-            var cbTask = WithCircuitBreaker(body,(b) => Task.Factory.StartNew(b));
-            if (!cbTask.Wait(CallTimeout))
-            {
-                //throw new TimeoutException( string.Format( "Execution did not complete within the time allotted {0} ms", CallTimeout.TotalMilliseconds ) );
-            }
-            if (cbTask.Exception != null)
-            {
-                ExceptionDispatchInfo.Capture(cbTask.Exception).Throw();
-            }
-        }
+        /// <param name="body">Call needing protected</param>
+        public void WithSyncCircuitBreaker(Action body) =>
+            WithCircuitBreaker(body, b => Task.Run(b)).GetAwaiter().GetResult();
 
         /// <summary>
-        /// Wraps invocations of asynchronous calls that need to be protected
-        /// If this does not complete within the time allotted, it should return default(<typeparamref name="T"/>)
-        ///
-        /// <code>
-        ///  Await.result(
-        ///      withCircuitBreaker(try Future.successful(body) catch { case NonFatal(t) ⇒ Future.failed(t) }),
-        ///      callTimeout)
-        /// </code>
-        ///
+        /// Wraps invocations of asynchronous calls that need to be protected.
         /// </summary>
-        /// <typeparam name="T">TBD</typeparam>
-        /// <param name="body">TBD</param>
-        /// <returns><typeparamref name="T"/> or default(<typeparamref name="T"/>)</returns>
-        public T WithSyncCircuitBreaker<T>(Func<T> body)
-        {
-            var cbTask = WithCircuitBreaker(body,(b) => Task.Factory.StartNew(b));
-            return cbTask.Wait(CallTimeout) ? cbTask.Result : default(T);
-        }
+        /// <param name="body">Call needing protected</param>
+        /// <returns>The result of the call</returns>
+        public T WithSyncCircuitBreaker<T>(Func<T> body) =>
+            WithCircuitBreaker(body, b => Task.Run(b)).Result;
 
         /// <summary>
         /// Mark a successful call through CircuitBreaker. Sometimes the callee of CircuitBreaker sends back a message to the