diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-08-23 15:08:07 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-08-23 15:08:07 -0700 |
| commit | 2abe950236d9e15510e83372c5dc0d68210580da (patch) | |
| tree | 3ad1b5a4d789ce51b02b7280323c2a69d2ea2124 /activerecord | |
| parent | 8d8fd13179cacd86f307e87396474bdfab9f3462 (diff) | |
| download | rails-2abe950236d9e15510e83372c5dc0d68210580da.tar.gz rails-2abe950236d9e15510e83372c5dc0d68210580da.tar.bz2 rails-2abe950236d9e15510e83372c5dc0d68210580da.zip | |
ivar will always be defined, so stop checking
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 9cec791faf..8acbc08e09 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -293,9 +293,7 @@ module ActiveRecord begin status = yield rescue ActiveRecord::Rollback - if defined?(@_start_transaction_state) - @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1 - end + @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1 status = nil end |