Connection implementations: direct access to activeTransaction property

Author: alex-kulakov

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Connection.cs

@@ -52,13 +52,13 @@ public override void Commit()
     {
       EnsureIsNotDisposed();
       EnsureTransactionIsActive();
-
       try {
-        if(!IsTransactionCompleted())
-          ActiveTransaction.Commit();
+        if(!IsTransactionCompleted()) {
+          activeTransaction.Commit();
+        }
       }
       finally {
-        ActiveTransaction.Dispose();
+        activeTransaction.Dispose();
         ClearActiveTransaction();
       }
     }
@@ -68,11 +68,12 @@ public override async Task CommitAsync(CancellationToken token = default)
       EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       try {
-        if (!IsTransactionCompleted())
-          await ActiveTransaction.CommitAsync(token).ConfigureAwait(false);
+        if (!IsTransactionCompleted()) {
+          await activeTransaction.CommitAsync(token).ConfigureAwait(false);
+        }
       }
       finally {
-        await ActiveTransaction.DisposeAsync().ConfigureAwait(false);
+        await activeTransaction.DisposeAsync().ConfigureAwait(false);
         ClearActiveTransaction();
       }
     }
@@ -81,13 +82,13 @@ public override void Rollback()
     {
       EnsureIsNotDisposed();
       EnsureTransactionIsActive();
-
       try {
-        if (!IsTransactionCompleted())
-          ActiveTransaction.Rollback();
+        if (!IsTransactionCompleted()) {
+          activeTransaction.Rollback();
+        }
       }
       finally {
-        ActiveTransaction.Dispose();
+        activeTransaction.Dispose();
         ClearActiveTransaction();
       }
     }
@@ -97,11 +98,12 @@ public override async Task RollbackAsync(CancellationToken token = default)
       EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       try {
-        if (!IsTransactionCompleted())
-          await ActiveTransaction.RollbackAsync(token).ConfigureAwait(false);
+        if (!IsTransactionCompleted()) {
+          await activeTransaction.RollbackAsync(token).ConfigureAwait(false);
+        }
       }
       finally {
-        await ActiveTransaction.DisposeAsync().ConfigureAwait(false);
+        await activeTransaction.DisposeAsync().ConfigureAwait(false);
         ClearActiveTransaction();
       }
     }
@@ -167,7 +169,7 @@ private void ExecuteNonQuery(string commandText)
       EnsureTransactionIsActive();
 
       using var command = CreateCommand(commandText);
-      command.ExecuteNonQuery();
+      _ = command.ExecuteNonQuery();
     }
 
     private async Task ExecuteNonQueryAsync(string commandText, CancellationToken token)
@@ -177,14 +179,11 @@ private async Task ExecuteNonQueryAsync(string commandText, CancellationToken to
 
       var command = CreateCommand(commandText);
       await using (command.ConfigureAwait(false)) {
-        await command.ExecuteNonQueryAsync(token).ConfigureAwait(false);
+        _ = await command.ExecuteNonQueryAsync(token).ConfigureAwait(false);
       }
     }
 
-    private bool IsTransactionCompleted()
-    {
-      return activeTransaction != null && activeTransaction.Connection == null;
-    }
+    private bool IsTransactionCompleted() => activeTransaction.Connection == null;
 
     // Constructors
 

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Connection.cs

@@ -126,11 +126,11 @@ public override void Rollback()
 
       try {
         if (!IsTransactionZombied()) {
-          ActiveTransaction.Rollback();
+          activeTransaction.Rollback();
         }
       }
       finally {
-        ActiveTransaction.Dispose();
+        activeTransaction.Dispose();
         ClearActiveTransaction();
       }
     }
@@ -143,11 +143,11 @@ public override async Task RollbackAsync(CancellationToken token = default)
 
       try {
         if (!IsTransactionZombied()) {
-          await ActiveTransaction.RollbackAsync(token).ConfigureAwait(false);
+          await activeTransaction.RollbackAsync(token).ConfigureAwait(false);
         }
       }
       finally {
-        await ActiveTransaction.DisposeAsync().ConfigureAwait(false);
+        await activeTransaction.DisposeAsync().ConfigureAwait(false);
         ClearActiveTransaction();
       }
     }
@@ -353,7 +353,7 @@ await SqlHelper.NotifyConnectionOpeningFailedAsync(accessors,
 
     private bool IsTransactionZombied()
     {
-      return ActiveTransaction != null && ActiveTransaction.Connection == null;
+      return activeTransaction.Connection == null;
     }
 
     // Constructors