diff options
| author | Yuki Nishijima <mail@yukinishijima.net> | 2015-11-03 06:54:34 -0800 |
|---|---|---|
| committer | Yuki Nishijima <mail@yukinishijima.net> | 2015-11-03 06:54:34 -0800 |
| commit | 266455cf25aba942b8717ceb0269d66f719b5696 (patch) | |
| tree | 702f6aab6d160c722fa85f628c06213be12f7763 /actionpack/lib/action_controller/metal/rescue.rb | |
| parent | d5890bdf660f670271a8f60bd091bd11db4c23b3 (diff) | |
| download | rails-266455cf25aba942b8717ceb0269d66f719b5696.tar.gz rails-266455cf25aba942b8717ceb0269d66f719b5696.tar.bz2 rails-266455cf25aba942b8717ceb0269d66f719b5696.zip | |
Deprecate exception#original_exception in favor of exception#cause
Diffstat (limited to 'actionpack/lib/action_controller/metal/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rescue.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/rescue.rb b/actionpack/lib/action_controller/metal/rescue.rb index 68cc9a9c9b..81b9a7b9ed 100644 --- a/actionpack/lib/action_controller/metal/rescue.rb +++ b/actionpack/lib/action_controller/metal/rescue.rb @@ -7,10 +7,8 @@ module ActionController #:nodoc: include ActiveSupport::Rescuable def rescue_with_handler(exception) - if (exception.respond_to?(:original_exception) && - (orig_exception = exception.original_exception) && - handler_for_rescue(orig_exception)) - exception = orig_exception + if exception.cause && handler_for_rescue(exception.cause) + exception = exception.cause end super(exception) end |