aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-12-30 13:49:31 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-12-30 13:49:31 -0800
commitbf9e6c7c9b231207deaf75e5b71290df77614dc8 (patch)
tree10ebf8e87f9e78ea8c9122bde5c0768df8c2a626 /activerecord/lib/active_record/connection_adapters/abstract
parent5dc7257b7a170c3c4719ccdb084ad3b4c1d227a1 (diff)
downloadrails-bf9e6c7c9b231207deaf75e5b71290df77614dc8.tar.gz
rails-bf9e6c7c9b231207deaf75e5b71290df77614dc8.tar.bz2
rails-bf9e6c7c9b231207deaf75e5b71290df77614dc8.zip
queue and signal no longer needed
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb2
1 files changed, 0 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 b548412644..51d2f40a3f 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -76,7 +76,6 @@ module ActiveRecord
# The cache of reserved connections mapped to threads
@reserved_connections = {}
- @queue = new_cond
@timeout = spec.config[:wait_timeout] || 5
# default max pool size to 5
@@ -214,7 +213,6 @@ module ActiveRecord
synchronize do
conn.run_callbacks :checkin do
conn.expire
- @queue.signal
end
end
end