From 1d530e23e52d36aa46707ed12f51f8c2f990a849 Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Thu, 18 Nov 2010 11:29:13 -0300 Subject: We have to check object class to avoid issues when using STI. --- activerecord/lib/active_record/identity_map.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb index 47ba3acf32..70ea08ee43 100644 --- a/activerecord/lib/active_record/identity_map.rb +++ b/activerecord/lib/active_record/identity_map.rb @@ -42,7 +42,8 @@ module ActiveRecord end def get(klass, primary_key) - repository[klass.symbolized_base_class][primary_key] + obj = repository[klass.symbolized_base_class][primary_key] + obj.is_a?(klass) ? obj : nil end def add(record) -- cgit v1.2.3