From b840e4ed509da433895fd2becf13f3e5656708e4 Mon Sep 17 00:00:00 2001 From: Marcel Molina Date: Wed, 12 Oct 2005 22:37:28 +0000 Subject: Deprecated ActiveRecord::Base.threaded_connection in favor of ActiveRecord::Base.allow_concurrency. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2542 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../connection_adapters/abstract/connection_specification.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_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb index caf4ba75de..b5ddef32af 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -62,7 +62,7 @@ module ActiveRecord end def self.active_connections #:nodoc: - if threaded_connections + if allow_concurrency Thread.current['active_connections'] ||= {} else @@active_connections ||= {} -- cgit v1.2.3