From 1712e37c90d0ac74b21589c0ee7b0365cb2b7beb Mon Sep 17 00:00:00 2001 From: Nick Sieger Date: Thu, 7 Aug 2008 23:13:21 -0700 Subject: Favor existing connections over new ones if available --- .../active_record/connection_adapters/abstract/connection_pool.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb') 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 50b2badbe6..1d7efc89e1 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -232,10 +232,10 @@ module ActiveRecord def checkout # Checkout an available connection conn = @connection_mutex.synchronize do - if @connections.length < @size - checkout_new_connection - elsif @checked_out.size < @connections.size + if @checked_out.size < @connections.size checkout_existing_connection + elsif @connections.size < @size + checkout_new_connection end end return conn if conn -- cgit v1.2.3