From c5f00580d376a226956401e8802ab7f0ffced563 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 12 Jun 2007 16:46:25 +0000 Subject: Fix precedence error in failsafe rescue. Closes #8625. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7006 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/dispatcher.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties') diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index de6b554219..fd39b1991b 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -40,7 +40,7 @@ class Dispatcher end rescue Exception => exception # errors from CGI dispatch failsafe_response(cgi, output, '500 Internal Server Error', exception) do - controller ||= ApplicationController rescue ActionController::Base + controller ||= (ApplicationController rescue ActionController::Base) controller.process_with_exception(request, response, exception).out(output) end ensure -- cgit v1.2.3