aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/transactions.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2011-04-03 20:09:00 -0300
committerJosé Valim <jose.valim@gmail.com>2011-04-04 10:48:12 +0200
commitb35617235d43bdb32016a623044e7f4005879969 (patch)
tree6a007f2bf9678fa1c1c5c64c8980032934fbefb0 /activerecord/lib/active_record/transactions.rb
parent16e5d158c23af1c7ca2c7aa32d964db97cb9a4f7 (diff)
downloadrails-b35617235d43bdb32016a623044e7f4005879969.tar.gz
rails-b35617235d43bdb32016a623044e7f4005879969.tar.bz2
rails-b35617235d43bdb32016a623044e7f4005879969.zip
Use IM when trying to load records using ID.
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record/transactions.rb')
-rw-r--r--activerecord/lib/active_record/transactions.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index 60d4c256c4..d363f36108 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -270,6 +270,7 @@ module ActiveRecord
def rolledback!(force_restore_state = false) #:nodoc:
run_callbacks :rollback
ensure
+ IdentityMap.remove(self) if IdentityMap.enabled?
restore_transaction_record_state(force_restore_state)
end