diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:55:29 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-07 19:55:29 -0500 |
| commit | 0994d11f26c318e63dd4189ea2dfec409132e529 (patch) | |
| tree | 885415e88c615376a7385abba887699f04b3a172 /activerecord/lib/active_record/connection_adapters/abstract | |
| parent | c77e6ace66b34390e9c1e173c580d86e88915267 (diff) | |
| parent | 1767c4b2da21379862a9ab1a4316d8da6b820a2a (diff) | |
| download | rails-0994d11f26c318e63dd4189ea2dfec409132e529.tar.gz rails-0994d11f26c318e63dd4189ea2dfec409132e529.tar.bz2 rails-0994d11f26c318e63dd4189ea2dfec409132e529.zip | |
Merge branch 'master' into testing
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
| -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 |