Skip to content

Commit

Permalink
Fix precedence error in failsafe rescue. Closes #8625.
Browse files Browse the repository at this point in the history
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7006 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
jeremy committed Jun 12, 2007
1 parent 979c224 commit c5f0058
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion railties/lib/dispatcher.rb
Expand Up @@ -40,7 +40,7 @@ def dispatch(cgi = nil, session_options = ActionController::CgiRequest::DEFAULT_
end end
rescue Exception => exception # errors from CGI dispatch rescue Exception => exception # errors from CGI dispatch
failsafe_response(cgi, output, '500 Internal Server Error', exception) do 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) controller.process_with_exception(request, response, exception).out(output)
end end
ensure ensure
Expand Down

0 comments on commit c5f0058

Please sign in to comment.