From a026b4c983681b71d876ea37958c3e5bc605acac Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sat, 22 Nov 2008 13:24:37 +0100
Subject: Let ApplicationController stay unloaded for as long as possible

---
 actionpack/lib/action_controller/dispatcher.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb
index d93edf067c..1c7a4b0545 100644
--- a/actionpack/lib/action_controller/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatcher.rb
@@ -12,8 +12,6 @@ module ActionController
           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 @@ module ActionController
 
       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
-- 
cgit v1.2.3