From 48edab9ba07fccfd0c44ecb2b5675383bdb36851 Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Fri, 15 Oct 2010 16:33:27 -0300 Subject: Don't wrap into identity map if it is disabled. --- activerecord/lib/active_record/identity_map.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb index 30a2a1eb0f..fe448abfdf 100644 --- a/activerecord/lib/active_record/identity_map.rb +++ b/activerecord/lib/active_record/identity_map.rb @@ -98,9 +98,8 @@ module ActiveRecord end def call(env) - ActiveRecord::IdentityMap.use do - @app.call(env) - end + ActiveRecord::IdentityMap.enabled? ? + ActiveRecord::IdentityMap.use { @app.call(env) } : @app.call(env) end end end -- cgit v1.2.3