Merge branch 'master' of https://github.com/rails/rails into performance_test

1 files changed, 8 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb
index d18b2b0a54..95a8e5cff7 100644
--- a/activerecord/lib/active_record/identity_map.rb
+++ b/activerecord/lib/active_record/identity_map.rb
@@ -50,7 +50,14 @@ module ActiveRecord
 
       def get(klass, primary_key)
         obj = repository[klass.symbolized_base_class][primary_key]
-        obj.is_a?(klass) ? obj : nil
+        if obj.is_a?(klass)
+          if ActiveRecord::Base.logger
+            ActiveRecord::Base.logger.debug "#{klass} with ID = #{primary_key} loaded from Identity Map"
+          end
+          obj
+        else
+          nil
+        end
       end
 
       def add(record)