diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-23 12:03:30 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-23 12:03:30 +0000 |
| commit | 3306813be1efaa6f696142cd3977c25d09317875 (patch) | |
| tree | 32a9cd6e0bee394771777a91ced6c089d81c6ccb /actionpack/lib/action_controller/rescue.rb | |
| parent | 373adc7f86f68f7b16d136835bb9254aaffd797f (diff) | |
| download | rails-3306813be1efaa6f696142cd3977c25d09317875.tar.gz rails-3306813be1efaa6f696142cd3977c25d09317875.tar.bz2 rails-3306813be1efaa6f696142cd3977c25d09317875.zip | |
Tweaked the rescue with breakpoint, still not perfect
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@986 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |