diff options
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 9c68435b0c..d1962f0c1f 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -73,14 +73,12 @@ module ActiveRecord # trigger a ROLLBACK when raised, but not be re-raised by the transaction block. module ClassMethods def transaction(&block) - previous_handler = trap('TERM') { raise TransactionError, "Transaction aborted" } increment_open_transactions begin connection.transaction(Thread.current['start_db_transaction'], &block) ensure decrement_open_transactions - trap('TERM', previous_handler) end end |