1 files changed, 8 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
index 08b219cdd8..fd666c8c39 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -190,15 +190,17 @@ module ActiveRecord
         rollback_transaction if transaction
         raise
       ensure
-        begin
+        unless error
           if Thread.current.status == 'aborting'
             rollback_transaction
-          elsif !error
-            commit_transaction
+          else
+            begin
+              commit_transaction
+            rescue Exception
+              transaction.rollback unless transaction.state.completed?
+              raise
+            end
           end
-        rescue Exception
-          transaction.rollback unless transaction.state.completed?
-          raise
         end
       end