From 2abe950236d9e15510e83372c5dc0d68210580da Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 23 Aug 2012 15:08:07 -0700 Subject: ivar will always be defined, so stop checking --- activerecord/lib/active_record/transactions.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'activerecord/lib') 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 -- cgit v1.2.3