From 806345451a14e19d56993c96cf52e7185fb7760e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 23 Mar 2021 16:19:00 +0300 Subject: [PATCH] Fix order of commit/rollback --- .../Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs index 5e6669a6f5..4b93c2f96b 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs @@ -30,8 +30,6 @@ namespace Volo.Abp.Uow.EntityFrameworkCore public async Task CommitAsync() { - await DbContextTransaction.CommitAsync(CancellationTokenProvider.Token); - foreach (var dbContext in AttendedDbContexts) { if (dbContext.As().HasRelationalTransactionManager() && @@ -42,6 +40,8 @@ namespace Volo.Abp.Uow.EntityFrameworkCore await dbContext.Database.CommitTransactionAsync(CancellationTokenProvider.Token); } + + await DbContextTransaction.CommitAsync(CancellationTokenProvider.Token); } public void Dispose() @@ -51,8 +51,6 @@ namespace Volo.Abp.Uow.EntityFrameworkCore public async Task RollbackAsync(CancellationToken cancellationToken) { - await DbContextTransaction.RollbackAsync(CancellationTokenProvider.FallbackToProvider(cancellationToken)); - foreach (var dbContext in AttendedDbContexts) { if (dbContext.As().HasRelationalTransactionManager() && @@ -63,6 +61,8 @@ namespace Volo.Abp.Uow.EntityFrameworkCore await dbContext.Database.RollbackTransactionAsync(CancellationTokenProvider.FallbackToProvider(cancellationToken)); } + + await DbContextTransaction.RollbackAsync(CancellationTokenProvider.FallbackToProvider(cancellationToken)); } } }