aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2013-07-22 03:27:57 -0700
committerPiotr Sarnacki <drogus@gmail.com>2013-07-22 03:27:57 -0700
commitbf2161d1abf2d8aa09a7cc36b72cf0da7f6e167c (patch)
tree5fbebe75fd752d9f5ac0652f5419dad7d938a82c /activerecord/lib/active_record
parent230d2f84a1877df47d55524e3903fb6d3e4dee75 (diff)
parent0b6c1f082f2112649611c993d39d4471ee1bb530 (diff)
downloadrails-bf2161d1abf2d8aa09a7cc36b72cf0da7f6e167c.tar.gz
rails-bf2161d1abf2d8aa09a7cc36b72cf0da7f6e167c.tar.bz2
rails-bf2161d1abf2d8aa09a7cc36b72cf0da7f6e167c.zip
Merge pull request #11538 from vipulnsward/rescue-exp
rescue from all exceptions in `ConnectionManagement#call`
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb2
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 811749c7fd..cfdcae7f63 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -624,7 +624,7 @@ module ActiveRecord
end
response
- rescue
+ rescue Exception
ActiveRecord::Base.clear_active_connections! unless testing
raise
end