diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-31 03:16:28 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-31 03:16:28 +0000 |
| commit | 12ff554cd476bd2c653d9fd331bbcabb71363f3a (patch) | |
| tree | cba0755d5ae3731380370af405e4f7e51490b27c /actionpack/lib/action_controller/rescue.rb | |
| parent | 785e1fa599050513f8d0b235338c771f04dcf422 (diff) | |
| download | rails-12ff554cd476bd2c653d9fd331bbcabb71363f3a.tar.gz rails-12ff554cd476bd2c653d9fd331bbcabb71363f3a.tar.bz2 rails-12ff554cd476bd2c653d9fd331bbcabb71363f3a.zip | |
Tighten rescue clauses. Closes #5985.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4885 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 7cd05eab32..dd670fe96d 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -78,7 +78,7 @@ module ActionController #:nodoc: def perform_action_with_rescue #:nodoc: begin perform_action_without_rescue - rescue Object => exception + rescue Exception => exception # errors from action performed if defined?(Breakpoint) && params["BP-RETRY"] msg = exception.backtrace.first if md = /^(.+?):(\d+)(?::in `(.+)')?$/.match(msg) then |