From a652a04fd278a2d82a454b829b42888d2eed22ce Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 30 Nov 2021 11:48:07 +0800 Subject: [PATCH] Use `catch (Exception e) when`. --- .../UnitOfWorkDbContextProvider.cs | 98 ++++++------------- 1 file changed, 30 insertions(+), 68 deletions(-) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs index 245c3a3d70..535be1192c 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs @@ -187,17 +187,12 @@ namespace Volo.Abp.Uow.EntityFrameworkCore ) ); } - catch (Exception e) + catch (Exception e) when (e is InvalidOperationException || e is NotSupportedException) { - if (e is InvalidOperationException || e is NotSupportedException) - { - Logger.LogError(TransactionsNotSupportedErrorMessage); - Logger.LogException(e); - } - else - { - throw; - } + Logger.LogError(TransactionsNotSupportedErrorMessage); + Logger.LogException(e); + + return dbContext; } return dbContext; @@ -230,19 +225,12 @@ namespace Volo.Abp.Uow.EntityFrameworkCore dbContext.Database.BeginTransaction(); } } - catch (Exception e) + catch (Exception e) when (e is InvalidOperationException || e is NotSupportedException) { - if (e is InvalidOperationException || e is NotSupportedException) - { - Logger.LogError(TransactionsNotSupportedErrorMessage); - Logger.LogException(e); - - return dbContext; - } - else - { - throw; - } + Logger.LogError(TransactionsNotSupportedErrorMessage); + Logger.LogException(e); + + return dbContext; } } } @@ -255,19 +243,12 @@ namespace Volo.Abp.Uow.EntityFrameworkCore */ dbContext.Database.BeginTransaction(); } - catch (Exception e) + catch (Exception e) when (e is InvalidOperationException || e is NotSupportedException) { - if (e is InvalidOperationException || e is NotSupportedException) - { - Logger.LogError(TransactionsNotSupportedErrorMessage); - Logger.LogException(e); - - return dbContext; - } - else - { - throw; - } + Logger.LogError(TransactionsNotSupportedErrorMessage); + Logger.LogException(e); + + return dbContext; } } @@ -301,17 +282,12 @@ namespace Volo.Abp.Uow.EntityFrameworkCore ) ); } - catch (Exception e) + catch (Exception e) when (e is InvalidOperationException || e is NotSupportedException) { - if (e is InvalidOperationException || e is NotSupportedException) - { - Logger.LogError(TransactionsNotSupportedErrorMessage); - Logger.LogException(e); - } - else - { - throw; - } + Logger.LogError(TransactionsNotSupportedErrorMessage); + Logger.LogException(e); + + return dbContext; } return dbContext; @@ -349,19 +325,12 @@ namespace Volo.Abp.Uow.EntityFrameworkCore ); } } - catch (Exception e) + catch (Exception e) when (e is InvalidOperationException || e is NotSupportedException) { - if (e is InvalidOperationException || e is NotSupportedException) - { - Logger.LogError(TransactionsNotSupportedErrorMessage); - Logger.LogException(e); - - return dbContext; - } - else - { - throw; - } + Logger.LogError(TransactionsNotSupportedErrorMessage); + Logger.LogException(e); + + return dbContext; } } } @@ -374,19 +343,12 @@ namespace Volo.Abp.Uow.EntityFrameworkCore */ await dbContext.Database.BeginTransactionAsync(GetCancellationToken()); } - catch (Exception e) + catch (Exception e) when (e is InvalidOperationException || e is NotSupportedException) { - if (e is InvalidOperationException || e is NotSupportedException) - { - Logger.LogError(TransactionsNotSupportedErrorMessage); - Logger.LogException(e); - - return dbContext; - } - else - { - throw; - } + Logger.LogError(TransactionsNotSupportedErrorMessage); + Logger.LogException(e); + + return dbContext; } }