From 3306813be1efaa6f696142cd3977c25d09317875 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 23 Mar 2005 12:03:30 +0000 Subject: Tweaked the rescue with breakpoint, still not perfect git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@986 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/rescue.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (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 0fe96479f4..2ee320a304 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -77,8 +77,8 @@ module ActionController #:nodoc: def perform_action_with_rescue #:nodoc: begin perform_action_without_rescue - rescue => exception - if defined?(Breakpoint) and @params["BP-RETRY"] then + rescue Object => exception + if defined?(Breakpoint) && @params["BP-RETRY"] msg = exception.backtrace.first if md = /^(.+?):(\d+)(?::in `(.+)')?$/.match(msg) then origin_file, origin_line = md[1], md[2].to_i -- cgit v1.2.3