From fa1f5e062ec621238b0a36c6093329429d2a218b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 29 Dec 2004 21:26:20 +0000 Subject: Switch dispatcher to use the new shared Dependencies approach git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@280 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/dispatcher.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index e539ab5af8..9cea6ce249 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -40,11 +40,11 @@ class Dispatcher rescue Object => exception ActionController::Base.process_with_exception(request, response, exception).out ensure - if ActionController::Base.reload_dependencies + if Dependencies.mechanism == :load Object.send(:remove_const, "ApplicationController") if Object.const_defined?(:ApplicationController) Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name)) ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses - ActiveRecord::Base.reload_associations_loaded + Dependencies.reload end Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT) -- cgit v1.2.3