diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:49:15 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:49:15 -0500 |
| commit | 1767c4b2da21379862a9ab1a4316d8da6b820a2a (patch) | |
| tree | bebf99e031bc1a3408baf32c2d16bc870637b913 /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | |
| parent | 983dc8078708fff5d99fc31eb5eac8b532e950b3 (diff) | |
| parent | d20955f889223b6035dbc7d61acba9091bf7b7ed (diff) | |
| download | rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.tar.gz rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.tar.bz2 rails-1767c4b2da21379862a9ab1a4316d8da6b820a2a.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 5 |
1 files changed, 1 insertions, 4 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 54a17e20a9..cf760e334e 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -292,10 +292,7 @@ module ActiveRecord # and also returns connections to the pool cached by threads that are no # longer alive. def clear_active_connections! - @connection_pools.each_value do |pool| - pool.release_connection - pool.clear_stale_cached_connections! - end + @connection_pools.each_value {|pool| pool.release_connection } end # Clears the cache which maps classes |