Permalink
Browse files

Fix precedence error in failsafe rescue. Closes #8625.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7006 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 979c224 commit c5f00580d376a226956401e8802ab7f0ffced563 @jeremy jeremy committed Jun 12, 2007
Showing with 1 addition and 1 deletion.
  1. +1 −1 railties/lib/dispatcher.rb
@@ -40,7 +40,7 @@ def dispatch(cgi = nil, session_options = ActionController::CgiRequest::DEFAULT_
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

0 comments on commit c5f0058

Please sign in to comment.