Browse Source

Fix order of commit/rollback

pull/8168/head
Halil İbrahim Kalkan 6 years ago
parent
commit
806345451a
  1. 8
      framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs

8
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs

@ -30,8 +30,6 @@ namespace Volo.Abp.Uow.EntityFrameworkCore
public async Task CommitAsync() public async Task CommitAsync()
{ {
await DbContextTransaction.CommitAsync(CancellationTokenProvider.Token);
foreach (var dbContext in AttendedDbContexts) foreach (var dbContext in AttendedDbContexts)
{ {
if (dbContext.As<DbContext>().HasRelationalTransactionManager() && if (dbContext.As<DbContext>().HasRelationalTransactionManager() &&
@ -42,6 +40,8 @@ namespace Volo.Abp.Uow.EntityFrameworkCore
await dbContext.Database.CommitTransactionAsync(CancellationTokenProvider.Token); await dbContext.Database.CommitTransactionAsync(CancellationTokenProvider.Token);
} }
await DbContextTransaction.CommitAsync(CancellationTokenProvider.Token);
} }
public void Dispose() public void Dispose()
@ -51,8 +51,6 @@ namespace Volo.Abp.Uow.EntityFrameworkCore
public async Task RollbackAsync(CancellationToken cancellationToken) public async Task RollbackAsync(CancellationToken cancellationToken)
{ {
await DbContextTransaction.RollbackAsync(CancellationTokenProvider.FallbackToProvider(cancellationToken));
foreach (var dbContext in AttendedDbContexts) foreach (var dbContext in AttendedDbContexts)
{ {
if (dbContext.As<DbContext>().HasRelationalTransactionManager() && if (dbContext.As<DbContext>().HasRelationalTransactionManager() &&
@ -63,6 +61,8 @@ namespace Volo.Abp.Uow.EntityFrameworkCore
await dbContext.Database.RollbackTransactionAsync(CancellationTokenProvider.FallbackToProvider(cancellationToken)); await dbContext.Database.RollbackTransactionAsync(CancellationTokenProvider.FallbackToProvider(cancellationToken));
} }
await DbContextTransaction.RollbackAsync(CancellationTokenProvider.FallbackToProvider(cancellationToken));
} }
} }
} }

Loading…
Cancel
Save