diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2015-07-20 09:12:09 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2015-07-20 09:12:09 -0600 |
| commit | c0f79be895796562e38e3fbd35d2741ee3fb85a5 (patch) | |
| tree | fc2cc53a6795ee099fec878e4c33f7337f05b476 /activerecord/lib | |
| parent | c0ef95a1c6db3095c4b5f80f8044fbbbdfebeff1 (diff) | |
| parent | 12b0b26df7560ab5199ba830586864085441508f (diff) | |
| download | rails-c0f79be895796562e38e3fbd35d2741ee3fb85a5.tar.gz rails-c0f79be895796562e38e3fbd35d2741ee3fb85a5.tar.bz2 rails-c0f79be895796562e38e3fbd35d2741ee3fb85a5.zip | |
Merge pull request #20947
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 267ac26c79..887d7a5903 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -379,6 +379,10 @@ module ActiveRecord raise ActiveRecord::Rollback unless status end status + ensure + if @transaction_state && @transaction_state.committed? + clear_transaction_record_state + end end protected |