diff options
| author | Wes Oldenbeuving <narnach@gmail.com> | 2008-11-05 18:27:23 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-11-06 00:24:09 +0530 |
| commit | 32089cbcc9ca3fb935f783e7a7ef2b60b7d43006 (patch) | |
| tree | 7a84394a01189947459781e32d17ca80f4905d41 /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | |
| parent | 5fad229e43e2b2541ed39c6ef571975176e6a8d2 (diff) | |
| download | rails-32089cbcc9ca3fb935f783e7a7ef2b60b7d43006.tar.gz rails-32089cbcc9ca3fb935f783e7a7ef2b60b7d43006.tar.bz2 rails-32089cbcc9ca3fb935f783e7a7ef2b60b7d43006.zip | |
Ensure ActiveRecord::ConnectionPool.connected? handles undefined connections. [#936 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
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 432c341e6c..3016c329bd 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -324,7 +324,7 @@ module ActiveRecord # Returns true if a connection that's accessible to this class has # already been opened. def connected?(klass) - retrieve_connection_pool(klass).connected? + conn = retrieve_connection_pool(klass) ? conn.connected? : false end # Remove the connection for this class. This will close the active |