From 19fbd84e126e77fccafbca06d3b8e9723de492cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20L=C3=BCtke?= Date: Tue, 22 May 2007 19:17:43 +0000 Subject: Rescuing in around_filters works as expected again [codahale, Stephan Kaes]. Closes #8341 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6810 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/filters.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb index 58f0ca491d..5705960eb5 100644 --- a/actionpack/lib/action_controller/filters.rb +++ b/actionpack/lib/action_controller/filters.rb @@ -713,6 +713,11 @@ module ActionController #:nodoc: perform_action_without_filters unless performed? || aborted return index if aborted || nesting != 0 + # if an around filter catches an exception during rendering and handles it, e.g. + # by rendering an error page, we might have left over around filters in the filter + # chain. so skip over these. + index = index.next while (filter = chain[index]) && filter.type == :around + # run after filters, if any while chain[index] filter, index = skip_excluded_filters(chain, index) -- cgit v1.2.3