Permalink
Browse files

remove useless conditional

  • Loading branch information...
1 parent d780d1f commit 9d549986dd67df15ae45bb679ef1d9b40b4a1252 @tenderlove tenderlove committed Jan 18, 2011
Showing with 8 additions and 10 deletions.
  1. +8 −10 activerecord/lib/active_record/transactions.rb
@@ -325,16 +325,14 @@ def restore_transaction_record_state(force = false) #:nodoc
@_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1
if @_start_transaction_state[:level] < 1
restore_state = remove_instance_variable(:@_start_transaction_state)
- if restore_state
- @attributes = @attributes.dup if @attributes.frozen?
- @new_record = restore_state[:new_record]
- @destroyed = restore_state[:destroyed]
- if restore_state.has_key?(:id)
- self.id = restore_state[:id]
- else
- @attributes.delete(self.class.primary_key)
- @attributes_cache.delete(self.class.primary_key)
- end
+ @attributes = @attributes.dup if @attributes.frozen?
+ @new_record = restore_state[:new_record]
+ @destroyed = restore_state[:destroyed]
+ if restore_state.has_key?(:id)
+ self.id = restore_state[:id]
+ else
+ @attributes.delete(self.class.primary_key)
+ @attributes_cache.delete(self.class.primary_key)
end
end
end

0 comments on commit 9d54998

Please sign in to comment.