diff options
| author | Yuri Smirnov <tycooon@yandex.ru> | 2015-02-05 16:21:37 +0300 |
|---|---|---|
| committer | Yuri Smirnov <tycooon@yandex.ru> | 2015-02-05 16:21:37 +0300 |
| commit | 68198c3e38d7d5e69564cfd5fdb982673aedaee8 (patch) | |
| tree | d69451e78cabb90797d9deab137bfc6273a07190 /activerecord | |
| parent | f499ecf961115a17715c1d094ece65861ee5fac0 (diff) | |
| download | rails-68198c3e38d7d5e69564cfd5fdb982673aedaee8.tar.gz rails-68198c3e38d7d5e69564cfd5fdb982673aedaee8.tar.bz2 rails-68198c3e38d7d5e69564cfd5fdb982673aedaee8.zip | |
fix transaction rollback in case of aborting thread
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb index 1eb30956d4..11440e30d4 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb @@ -185,7 +185,7 @@ module ActiveRecord ensure unless error if Thread.current.status == 'aborting' - rollback_transaction + rollback_transaction if transaction else begin commit_transaction |