Let ApplicationController stay unloaded for as long as possible

rails · Nov 22, 2008 · a026b4c · a026b4c
1 parent e50530c
commit a026b4c
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb
@@ -12,8 +12,6 @@ def define_dispatcher_callbacks(cache_classes)
           after_dispatch :cleanup_application
         end
 
-        to_prepare(:load_application_controller) { ApplicationController }
-
         if defined?(ActiveRecord)
           after_dispatch :checkin_connections
           to_prepare(:activerecord_instantiate_observers) { ActiveRecord::Base.instantiate_observers }
@@ -178,7 +176,7 @@ def handle_request
 
       def failsafe_rescue(exception)
         self.class.failsafe_response(@output, '500 Internal Server Error', exception) do
-          if @controller ||= defined?(::ApplicationController) ? ::ApplicationController : Base
+          if @controller ||= (::ApplicationController rescue Base)
             @controller.process_with_exception(@request, @response, exception).out(@output)
           else
             raise exception