diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-02 23:42:21 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-02 23:42:21 +0000 |
| commit | b3739fca2c185831c97efdd9fdcaa23476863539 (patch) | |
| tree | b3b70368a890c40105bc40af4a0fe5f5f0141a62 | |
| parent | 612bb73fece343bfda765dda91eabb1d2a6b310c (diff) | |
| download | rails-b3739fca2c185831c97efdd9fdcaa23476863539.tar.gz rails-b3739fca2c185831c97efdd9fdcaa23476863539.tar.bz2 rails-b3739fca2c185831c97efdd9fdcaa23476863539.zip | |
Nuke the controllers after the dispatcher reload to avoid the superclass mismatch problem
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@323 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/lib/dispatcher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 3298611227..7ae2affb45 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -41,9 +41,9 @@ class Dispatcher ActionController::Base.process_with_exception(request, response, exception).out ensure if Dependencies.mechanism == :load - remove_class_hierarchy(controller_class(controller_name), ActionController::Base) ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses Dependencies.reload rescue nil # Ignore out of order reloading errors for Controllers + remove_class_hierarchy(controller_class(controller_name), ActionController::Base) end Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT) |