Merge branch 'dev' into fix-hyperion-serializer

akkadotnet · Oct 25, 2024 · 732f5cc · 732f5cc
2 parents 806cca1 + 07c2b51
commit 732f5cc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/core/Akka.Persistence/Eventsourced.Recovery.cs b/src/core/Akka.Persistence/Eventsourced.Recovery.cs
@@ -100,7 +100,7 @@ bool RecoveryBehavior(object message)
                                         Unhandled(offer);
                                     }
                                 }
-                                catch(Exception ex)
+                                catch (Exception ex)
                                 {
                                     try
                                     {
@@ -150,6 +150,7 @@ bool RecoveryBehavior(object message)
                 }
                 catch (Exception)
                 {
+                    timeoutCancelable.Cancel();
                     ReturnRecoveryPermit();
                     throw;
                 }
@@ -261,6 +262,7 @@ private EventsourcedState Recovering(Receive recoveryBehavior, TimeSpan timeout)
                 }
                 catch (Exception)
                 {
+                    timeoutCancelable.Cancel();
                     ReturnRecoveryPermit();
                     throw;
                 }