From 12ff554cd476bd2c653d9fd331bbcabb71363f3a Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 31 Aug 2006 03:16:28 +0000 Subject: Tighten rescue clauses. Closes #5985. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4885 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/rescue.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/rescue.rb') 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 -- cgit v1.2.3