From 01ead94d0b11b00fb8726a868f5538c7a5a1af35 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 20 Jan 2005 15:35:20 +0000 Subject: Flipped reloads around git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@471 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/dispatcher.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib') diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 2cbc42eaff..fe7142be9d 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -49,9 +49,9 @@ class Dispatcher private def reset_application(controller_name) begin + remove_class_hierarchy(controller_class(controller_name), ActionController::Base) ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses Dependencies.clear - remove_class_hierarchy(controller_class(controller_name), ActionController::Base) rescue Object => exception # Compilation errors are caught on the first run through end -- cgit v1.2.3