aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorNick Sieger <nick@nicksieger.com>2008-08-07 08:33:42 -0700
committerNick Sieger <nick@nicksieger.com>2008-08-29 14:12:11 -0500
commit3ce64d4f1608330072e1959a10f9b84205baebfa (patch)
treec44dd05461087d99fbe99ea47def85a7340cd696 /activerecord/lib/active_record
parentfe575dd4a9f0fa0e71a89fae9f4a951a9fb36058 (diff)
downloadrails-3ce64d4f1608330072e1959a10f9b84205baebfa.tar.gz
rails-3ce64d4f1608330072e1959a10f9b84205baebfa.tar.bz2
rails-3ce64d4f1608330072e1959a10f9b84205baebfa.zip
Fix checkin method, add a couple more tests
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb2
1 files changed, 1 insertions, 1 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 97c6e3e886..3d727bd0e6 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -237,7 +237,7 @@ module ActiveRecord
def checkin(conn)
@connection_mutex.synchronize do
- @checked_out -= conn
+ @checked_out.delete conn
@queue.signal
end
end