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

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]

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