From 08c37b7ed8281bc3e3c1eca98a4859017c89157a Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Fri, 15 Oct 2010 15:44:21 -0300 Subject: Use block syntax in IdentityMap middleware. --- activerecord/lib/active_record/identity_map.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'activerecord/lib/active_record/identity_map.rb') diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb index cca4198c69..30a2a1eb0f 100644 --- a/activerecord/lib/active_record/identity_map.rb +++ b/activerecord/lib/active_record/identity_map.rb @@ -27,7 +27,12 @@ module ActiveRecord end def use + old, self.enabled = self.enabled, true + yield if block_given? + ensure + self.enabled = old + ActiveRecord::IdentityMap.clear end def without @@ -93,9 +98,9 @@ module ActiveRecord end def call(env) - @app.call(env) - ensure - ActiveRecord::IdentityMap.clear + ActiveRecord::IdentityMap.use do + @app.call(env) + end end end end -- cgit v1.2.3