From 54fcd9305b07dc32b8e4f1ba9480b8156f4e4630 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Sat, 14 Jun 2025 12:15:46 +0200
Subject: [PATCH] Simplify exception handling logic in
 `ExceptionHandlingMiddleware`

- Removed `LogExceptionAndTransition` and `FaultAncestors` methods.
- Integrated exception fault handling with `ActivityExecutionContext.Fault()`.
---
 .../Activities/ExceptionHandlingMiddleware.cs | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/modules/Elsa.Workflows.Core/Middleware/Activities/ExceptionHandlingMiddleware.cs b/src/modules/Elsa.Workflows.Core/Middleware/Activities/ExceptionHandlingMiddleware.cs
index 60f4e3fec..b7028e2b8 100644
--- a/src/modules/Elsa.Workflows.Core/Middleware/Activities/ExceptionHandlingMiddleware.cs
+++ b/src/modules/Elsa.Workflows.Core/Middleware/Activities/ExceptionHandlingMiddleware.cs
@@ -1,8 +1,6 @@
 using Elsa.Common;
 using Elsa.Extensions;
-using Elsa.Workflows.Models;
 using Elsa.Workflows.Pipelines.ActivityExecution;
-using Elsa.Workflows.State;
 using Microsoft.Extensions.Logging;
 
 namespace Elsa.Workflows.Middleware.Activities;
@@ -34,34 +32,14 @@ public class ExceptionHandlingMiddleware(ActivityMiddlewareDelegate next, IIncid
         catch (Exception e)
         {
             logger.LogWarning(e, "An exception was caught from a downstream middleware component");
-            LogExceptionAndTransition(context, e);
-            FaultAncestors(context);
+            context.Fault(e);
             await HandleIncidentAsync(context);
         }
     }
 
-    private void LogExceptionAndTransition(ActivityExecutionContext context, Exception e)
-    {
-        context.Exception = e;
-        context.TransitionTo(ActivityStatus.Faulted);
-        var activity = context.Activity;
-        var exceptionState = ExceptionState.FromException(e);
-        var now = systemClock.UtcNow;
-        var incident = new ActivityIncident(activity.Id, activity.NodeId ,activity.Type, e.Message, exceptionState, now);
-        context.WorkflowExecutionContext.Incidents.Add(incident);
-    }
-
     private async Task HandleIncidentAsync(ActivityExecutionContext context)
     {
         var strategy = await incidentStrategyResolver.ResolveStrategyAsync(context);
         strategy.HandleIncident(context);
     }
-
-    private static void FaultAncestors(ActivityExecutionContext context)
-    {
-        var ancestors = context.GetAncestors();
-
-        foreach (var ancestor in ancestors)
-            ancestor.TransitionTo(ActivityStatus.Faulted);
-    }
 }
\ No newline at end of file