diff options
author | Nick Sieger <nick@nicksieger.com> | 2009-10-16 11:39:32 -0500 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-10-16 10:34:52 -0700 |
commit | 471a394215e01ffae03bbafa027a44f63e0658b8 (patch) | |
tree | 64095f9b3b074648453c15ee548720ec4b3f6d04 /activerecord/lib/active_record/connection_adapters/abstract | |
parent | b0f55dc1f82b3d4fc56d44133b10926be3efa607 (diff) | |
download | rails-471a394215e01ffae03bbafa027a44f63e0658b8.tar.gz rails-471a394215e01ffae03bbafa027a44f63e0658b8.tar.bz2 rails-471a394215e01ffae03bbafa027a44f63e0658b8.zip |
Modify connection pool callbacks to be compatible w/ new style
Signed-off-by: Yehuda Katz <wycats@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 14 |
1 files changed, 8 insertions, 6 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 12253eac3f..377f2a44c5 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -211,9 +211,10 @@ module ActiveRecord # calling +checkout+ on this pool. def checkin(conn) @connection_mutex.synchronize do - conn.run_callbacks :checkin - @checked_out.delete conn - @queue.signal + conn.run_callbacks :checkin do + @checked_out.delete conn + @queue.signal + end end end @@ -255,9 +256,10 @@ module ActiveRecord end def checkout_and_verify(c) - c.verify! - c.run_callbacks :checkout - @checked_out << c + c.run_callbacks :checkout do + c.verify! + @checked_out << c + end c end end |