fix transaction rollback in case of aborting thread

68198c3e · Yuri Smirnov · f499ecf9 · 68198c3e
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

activerecord/lib/active_record/connection_adapters/abstract/transaction.rb ...active_record/connection_adapters/abstract/transaction.rb +1 -1

未找到文件。
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -185,7 +185,7 @@ def within_new_transaction(options = {})
      ensure
        unless error
          if Thread.current.status == 'aborting'
-            rollback_transaction
+            rollback_transaction if transaction
          else
            begin
              commit_transaction