aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-01-20 15:35:20 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-01-20 15:35:20 +0000
commit01ead94d0b11b00fb8726a868f5538c7a5a1af35 (patch)
tree4a7b8dddc39d901c5ec1481827fd6c689b98f2dc /railties/lib
parent99598820cf662ece0e2e97cc2ef07da3da6ea9f9 (diff)
downloadrails-01ead94d0b11b00fb8726a868f5538c7a5a1af35.tar.gz
rails-01ead94d0b11b00fb8726a868f5538c7a5a1af35.tar.bz2
rails-01ead94d0b11b00fb8726a868f5538c7a5a1af35.zip
Flipped reloads around
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@471 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/dispatcher.rb2
1 files changed, 1 insertions, 1 deletions
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