diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-03-02 14:36:06 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-03-02 14:36:06 +0000 |
| commit | 215852745beae6cb4d61d2affff07cc1b2ef0186 (patch) | |
| tree | 5d95424b2b01edae6bbf0c41e4aae79cd38e20b9 /activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb | |
| parent | a4c6442612b50574795a52add5b9405f7028aab3 (diff) | |
| download | rails-215852745beae6cb4d61d2affff07cc1b2ef0186.tar.gz rails-215852745beae6cb4d61d2affff07cc1b2ef0186.tar.bz2 rails-215852745beae6cb4d61d2affff07cc1b2ef0186.zip | |
Revert allow_concurrency change for better testing. Retrieve_connection in two steps to avoid side-effect bug (yuk).
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3745 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 a65d6df6a1..7cb230fd3a 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -55,7 +55,8 @@ module ActiveRecord conn else # retrieve_connection sets the cache key. - active_connections[@active_connection_name] = retrieve_connection + conn = retrieve_connection + active_connections[@active_connection_name] = conn end end |