diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-29 21:26:20 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-29 21:26:20 +0000 |
| commit | fa1f5e062ec621238b0a36c6093329429d2a218b (patch) | |
| tree | 5eecb8b3679dc0fa90c356eafc8224489672c3ec /railties/lib/dispatcher.rb | |
| parent | 595a4a591b6f4f863d52e28046e2fc1c51dfcad5 (diff) | |
| download | rails-fa1f5e062ec621238b0a36c6093329429d2a218b.tar.gz rails-fa1f5e062ec621238b0a36c6093329429d2a218b.tar.bz2 rails-fa1f5e062ec621238b0a36c6093329429d2a218b.zip | |
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
Diffstat (limited to 'railties/lib/dispatcher.rb')
| -rw-r--r-- | railties/lib/dispatcher.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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) |