diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-23 23:45:07 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-23 23:45:07 -0300 |
| commit | 72c1abcc2f04fa2b0cdf89fd6093da544274c465 (patch) | |
| tree | fa06920a839c731ec18767c27cb77132ae565315 /activerecord/lib/active_record/connection_adapters | |
| parent | d43ef0d4e3ad0461bb86694563a167acd19ed60c (diff) | |
| parent | 4367d2f05cbeda855820e25a08353d4b7b3457ac (diff) | |
| download | rails-72c1abcc2f04fa2b0cdf89fd6093da544274c465.tar.gz rails-72c1abcc2f04fa2b0cdf89fd6093da544274c465.tar.bz2 rails-72c1abcc2f04fa2b0cdf89fd6093da544274c465.zip | |
Merge pull request #15881 from mmozuras/remove_unused_params
Remove unused params
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 6 |
1 files changed, 3 insertions, 3 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 db80c0faee..cb75070e3a 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -364,7 +364,7 @@ module ActiveRecord conn.expire end - release conn, owner + release owner @available.add conn end @@ -377,7 +377,7 @@ module ActiveRecord @connections.delete conn @available.delete conn - release conn, conn.owner + release conn.owner @available.add checkout_new_connection if @available.any_waiting? end @@ -425,7 +425,7 @@ module ActiveRecord end end - def release(conn, owner) + def release(owner) thread_id = owner.object_id @reserved_connections.delete thread_id |