diff options
| author | Mark J. Titorenko <mark@titorenko.net> | 2011-06-13 02:14:18 +0100 |
|---|---|---|
| committer | Mark J. Titorenko <mark@titorenko.net> | 2011-10-07 10:05:51 +0100 |
| commit | f41b58d3b25eb57ba5c890b713301ba2e3fcb9b7 (patch) | |
| tree | f07ff60695b4dea17355f8967e696682b5343b18 /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | |
| parent | 3088d23647899212f20bb8969f2084393a9e71cd (diff) | |
| download | rails-f41b58d3b25eb57ba5c890b713301ba2e3fcb9b7.tar.gz rails-f41b58d3b25eb57ba5c890b713301ba2e3fcb9b7.tar.bz2 rails-f41b58d3b25eb57ba5c890b713301ba2e3fcb9b7.zip | |
use thread locals and an instance variable within QueryCache#BodyProxy to maintain appropriate linkage with AR database connection across threads
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 | 2 |
1 files changed, 1 insertions, 1 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 20863e73aa..77a5fe1efb 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -314,7 +314,7 @@ module ActiveRecord end def current_connection_id #:nodoc: - Thread.current.object_id + ActiveRecord::Base.connection_id ||= Thread.current.object_id end def checkout_new_connection |