From b1ac881433b95498e3b63b2686d1e31f1bdb93fc Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 30 Dec 2011 14:31:30 -0800 Subject: connections are only removed if they are inactve --- .../lib/active_record/connection_adapters/abstract/connection_pool.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/connection_adapters/abstract') 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 3f3b98ace0..4173b3ebe6 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -239,7 +239,7 @@ module ActiveRecord synchronize do stale = Time.now - @timeout connections.dup.each do |conn| - remove conn if conn.in_use? && stale > conn.last_use + remove conn if conn.in_use? && stale > conn.last_use && !conn.active? end end end -- cgit v1.2.3