diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-08-18 19:04:10 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-08-20 15:08:48 -0700 |
| commit | d0d4ef6e8be08ab4f6a7faa2b3a5ef8423a99350 (patch) | |
| tree | 3d294fb5ca75067b33fd551813bb0e2ffb606d91 /activerecord | |
| parent | f298481b36d600dab032f7b77323354dea469ec0 (diff) | |
| download | rails-d0d4ef6e8be08ab4f6a7faa2b3a5ef8423a99350.tar.gz rails-d0d4ef6e8be08ab4f6a7faa2b3a5ef8423a99350.tar.bz2 rails-d0d4ef6e8be08ab4f6a7faa2b3a5ef8423a99350.zip | |
fix whitespace errors
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 5c3399e2aa..2a4f4fb2f9 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -293,12 +293,12 @@ module ActiveRecord begin status = yield rescue ActiveRecord::Rollback - if defined?(@_start_transaction_state) + if defined?(@_start_transaction_state) @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1 end status = nil end - + raise ActiveRecord::Rollback unless status end status |