diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-19 10:55:11 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-19 10:55:11 +0000 |
| commit | 81c5242f43cb45d97b2a56409f8b39b0dba75ac3 (patch) | |
| tree | 39b718add2f4ea15a24df9af62148d1574385a83 /activerecord/lib/active_record/base.rb | |
| parent | 77e0b7986e56e5d1d607aaa05a460709977c8c34 (diff) | |
| download | rails-81c5242f43cb45d97b2a56409f8b39b0dba75ac3.tar.gz rails-81c5242f43cb45d97b2a56409f8b39b0dba75ac3.tar.bz2 rails-81c5242f43cb45d97b2a56409f8b39b0dba75ac3.zip | |
r3181@asus: jeremy | 2005-11-19 02:52:24 -0800
Mark connections for verification. Retrieve connection verifies before returning a connection. Verification tests whether the connection is marked then reconnects if the connection is inactive. All active connections are marked for verification after a request is handled. References #428.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3096 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 2f7812d17b..e79dd45d88 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -247,11 +247,7 @@ module ActiveRecord #:nodoc: # also be used to "borrow" the connection to do database work unrelated # to any of the specific Active Records. def self.connection - if allow_concurrency - retrieve_connection - else - @connection ||= retrieve_connection - end + retrieve_connection end # Returns the connection currently associated with the class. This can |