diff options
author | Guo Xiang Tan <tgx_world@hotmail.com> | 2015-03-22 10:43:34 +0800 |
---|---|---|
committer | Guo Xiang Tan <tgx_world@hotmail.com> | 2015-03-22 11:21:02 +0800 |
commit | bdc1d329d4eea823d07cf010064bd19c07099ff3 (patch) | |
tree | ca60c74fd711b4b22c688b566734d216d5d8807b /activerecord/lib/active_record/connection_adapters | |
parent | 2271f7db17b728234abc2ca66e6cf9a4c55d8e84 (diff) | |
download | rails-bdc1d329d4eea823d07cf010064bd19c07099ff3.tar.gz rails-bdc1d329d4eea823d07cf010064bd19c07099ff3.tar.bz2 rails-bdc1d329d4eea823d07cf010064bd19c07099ff3.zip |
Revert "Reduce allocations when running AR callbacks."
This reverts commit 796cab45561fce268aa74e6587cdb9cae3bb243e.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb index d99dc9a5db..8c50f3d1a3 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -358,7 +358,7 @@ module ActiveRecord synchronize do owner = conn.owner - conn._run_checkin_callbacks do + conn.run_callbacks :checkin do conn.expire end @@ -449,7 +449,7 @@ module ActiveRecord end def checkout_and_verify(c) - c._run_checkout_callbacks do + c.run_callbacks :checkout do c.verify! end c |