aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMindaugas Mozūras <mindaugas.mozuras@gmail.com>2014-06-23 20:55:40 +0300
committerMindaugas Mozūras <mindaugas.mozuras@gmail.com>2014-06-23 22:53:39 +0300
commit4367d2f05cbeda855820e25a08353d4b7b3457ac (patch)
tree04361f8e7f580f5e33b61641fa9b1fa99c8c1d15
parente45d97217c3c774e95510b63c6be92d654419939 (diff)
downloadrails-4367d2f05cbeda855820e25a08353d4b7b3457ac.tar.gz
rails-4367d2f05cbeda855820e25a08353d4b7b3457ac.tar.bz2
rails-4367d2f05cbeda855820e25a08353d4b7b3457ac.zip
Remove unused param 'conn' from ConnectionPool#release
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb6
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