Permalink
Browse files

Make sure that exceptions which are thrown outside of the user code t…

…ry their best to be handeled in ApplicationController#rescue_action.

This allos handling of ActionController::RoutingError which were previously always handeled by ActionController#Base


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5516 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 4978d1d commit a64c6af57c4edc34a3e20783d05fcab07952bcbc Tobias Lütke committed Nov 13, 2006
Showing with 4 additions and 1 deletion.
  1. +2 −0 railties/CHANGELOG
  2. +2 −1 railties/lib/dispatcher.rb
View
2 railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make sure that exceptions which are thrown outside of the user code try their best to be handeled in ApplicationController#rescue_action [Tobias Luetke]
+
* Rails::VERSION::STRING should always be available without having to require 'rails/version'. #6244 [fearoffish]
* Update to Prototype 1.5.0_rc2. [Sam Stephenson]
View
3 railties/lib/dispatcher.rb
@@ -42,7 +42,8 @@ def dispatch(cgi = nil, session_options = ActionController::CgiRequest::DEFAULT_
end
rescue Exception => exception # errors from CGI dispatch
failsafe_response(output, '500 Internal Server Error', exception) do
- controller ||= const_defined?(:ApplicationController) ? ApplicationController : ActionController::Base
+ controller ||= ApplicationController rescue LoadError nil
+ controller ||= ActionController::Base
controller.process_with_exception(request, response, exception).out(output)
end
ensure

0 comments on commit a64c6af

Please sign in to comment.