Fixed rethrowing exceptions without preserving the original stacktrace

carl-berg · Dec 2, 2020 · d09abae · d09abae
1 parent 9de13f2
commit d09abae
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/Appeaser.Tests/MediatorSettingsTest.cs b/src/Appeaser.Tests/MediatorSettingsTest.cs
@@ -49,6 +49,14 @@ public void Test_Query_Exception_Wrapping_Can_Be_Disabled()
             Assert.Throws<Exception>(() => mediator.Request(new TestFeature.Query()));
         }
 
+        [Fact]
+        public void Test_Query_Exception_Preserves_Stacktrace()
+        {
+            var mediator = new Mediator(_handlerFactory, new TestMediatorSettings { WrapExceptions = false });
+            var exception = Assert.Throws<Exception>(() => mediator.Request(new TestFeature.Query()));
+            Assert.Equal(typeof(TestFeature.Handler), exception.TargetSite.DeclaringType);
+        }
+
         [Fact]
         public void Test_Command_Exception_Wrapping_Can_Be_Disabled()
         {

diff --git a/src/Appeaser/Appeaser.csproj b/src/Appeaser/Appeaser.csproj
@@ -3,7 +3,7 @@
         <TargetFrameworks>netstandard2.0;netstandard1.0;net45</TargetFrameworks>
         <Authors>Carl Berg</Authors>
         <Copyright>Copyright (c) $([System.DateTime]::Now.Year) Carl Berg</Copyright>
-        <VersionPrefix>2.3.2</VersionPrefix>
+        <VersionPrefix>2.3.3</VersionPrefix>
         <DisableImplicitFrameworkReferences Condition=" '$(TargetFramework)' == 'net45' ">true</DisableImplicitFrameworkReferences>
         <Description>Appeaser, the appeasing mediator</Description>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/Appeaser/Interception/MediatorInterceptor.cs b/src/Appeaser/Interception/MediatorInterceptor.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
 
 namespace Appeaser.Interception
@@ -42,7 +43,8 @@ public TResponse InvokeHandler<TResponse>(object handler, object parameter, Func
                     interceptor.Intercept(scope.CreateExceptionInterceptionContext<TResponse>(exception));
                 }
 
-                throw exception;
+                ExceptionDispatchInfo.Capture(exception).Throw();
+                throw new Exception("Should never happen, hopefully? :-)");
             }
         }
 
@@ -73,7 +75,8 @@ public async Task<TResponse> InvokeHandlerAsync<TResponse>(object handler, objec
                     await interceptor.InterceptAsync(scope.CreateExceptionInterceptionContext<TResponse>(exception));
                 }
 
-                throw exception;
+                ExceptionDispatchInfo.Capture(exception).Throw();
+                throw new Exception("Should never happen, hopefully? :-)");
             }
         }