diff --git a/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj b/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj index 9d46974..9feae0a 100644 --- a/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj +++ b/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj @@ -38,6 +38,10 @@ + + + + diff --git a/DigitalData.Core.Exceptions.Middleware/GlobalExceptionHandlerMiddleware.cs b/DigitalData.Core.Exceptions.Middleware/GlobalExceptionHandlerMiddleware.cs index 4f73279..c592d65 100644 --- a/DigitalData.Core.Exceptions.Middleware/GlobalExceptionHandlerMiddleware.cs +++ b/DigitalData.Core.Exceptions.Middleware/GlobalExceptionHandlerMiddleware.cs @@ -42,11 +42,11 @@ public class GlobalExceptionHandlerMiddleware } catch (Exception ex) { - if(ex.GetType() == typeof(Exception)) - _options?.DefaultHandler?.HandleExceptionAsync.Invoke(context, ex, _logger); + if(ex.GetType() == typeof(Exception) && _options?.DefaultHandler is not null) + await _options.DefaultHandler.HandleExceptionAsync(context, ex, _logger); if (_options?.Handlers.TryGetValue(ex.GetType(), out var handler) ?? false) - handler?.HandleExceptionAsync.Invoke(context, ex, _logger); + await handler.HandleExceptionAsync(context, ex, _logger); } } }