diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-04 06:03:14 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-04 06:03:14 -0800 |
commit | f1a6307a941a6f9c50cf7d196ba4a7bc1252501d (patch) | |
tree | a171065ecb7f840def449ce3046e52aa91b9b1a4 /activerecord/lib/active_record | |
parent | 75510a62f17747f9fd9abbc0ee0efc7e6795ae6b (diff) | |
parent | 9b66d6d47f87d31fb360f48542520d9216e77dc9 (diff) | |
download | rails-f1a6307a941a6f9c50cf7d196ba4a7bc1252501d.tar.gz rails-f1a6307a941a6f9c50cf7d196ba4a7bc1252501d.tar.bz2 rails-f1a6307a941a6f9c50cf7d196ba4a7bc1252501d.zip |
Merge pull request #13935 from arthurnn/fix_12566
Make sure transaction state resets after commit
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/transactions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index c33ffeece0..ec3e8f281b 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -295,7 +295,7 @@ module ActiveRecord def committed! #:nodoc: run_callbacks :commit if destroyed? || persisted? ensure - clear_transaction_record_state + @_start_transaction_state.clear end # Call the +after_rollback+ callbacks. The +force_restore_state+ argument indicates if the record |