diff options
| author | Kevin Casey <kacasey@berkeley.edu> | 2014-02-08 17:38:54 -0800 |
|---|---|---|
| committer | Kevin Casey <kacasey@berkeley.edu> | 2014-02-08 17:38:54 -0800 |
| commit | 02a3c0e771b3e09173412f93d8699d4825a366d6 (patch) | |
| tree | e89319efc7f7d01091f307aaebb1b79f5910f38c /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | |
| parent | 1ec25d15d9c2e19df0195165b99335a006d449b6 (diff) | |
| download | rails-02a3c0e771b3e09173412f93d8699d4825a366d6.tar.gz rails-02a3c0e771b3e09173412f93d8699d4825a366d6.tar.bz2 rails-02a3c0e771b3e09173412f93d8699d4825a366d6.zip | |
Reaper has access to threadsafe active? call
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 cebe741daa..759e162e19 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -393,7 +393,7 @@ module ActiveRecord synchronize do stale = Time.now - @dead_connection_timeout connections.dup.each do |conn| - if conn.in_use? && stale > conn.last_use && !conn.active? + if conn.in_use? && stale > conn.last_use && !conn.active_threadsafe? remove conn end end |