diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-10-15 17:32:18 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-11-19 19:08:56 -0300 |
| commit | 69b627ef670b1dc7fee0b5d25903cebdeed49576 (patch) | |
| tree | 0d4f22e612d2706ec3345d4937f208a906f73c1a /activerecord/lib/active_record/identity_map.rb | |
| parent | 48edab9ba07fccfd0c44ecb2b5675383bdb36851 (diff) | |
| download | rails-69b627ef670b1dc7fee0b5d25903cebdeed49576.tar.gz rails-69b627ef670b1dc7fee0b5d25903cebdeed49576.tar.bz2 rails-69b627ef670b1dc7fee0b5d25903cebdeed49576.zip | |
Don't load IdentityMap middleware if not enabled. Simplify middleware.
Diffstat (limited to 'activerecord/lib/active_record/identity_map.rb')
| -rw-r--r-- | activerecord/lib/active_record/identity_map.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb index fe448abfdf..30a2a1eb0f 100644 --- a/activerecord/lib/active_record/identity_map.rb +++ b/activerecord/lib/active_record/identity_map.rb @@ -98,8 +98,9 @@ module ActiveRecord end def call(env) - ActiveRecord::IdentityMap.enabled? ? - ActiveRecord::IdentityMap.use { @app.call(env) } : @app.call(env) + ActiveRecord::IdentityMap.use do + @app.call(env) + end end end end |