From 5f5d2d30a0c02d15b37f8f07db1b0abe9c7309f4 Mon Sep 17 00:00:00 2001 From: Andrew White Date: Sat, 7 Feb 2009 11:41:00 -0600 Subject: Move cleanup before prepare_dispatch so that constants are not loaded twice [#1898 state:resolved] Signed-off-by: Joshua Peek --- actionpack/lib/action_controller/dispatcher.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index 9374a7f060..e91babde10 100644 --- a/actionpack/lib/action_controller/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatcher.rb @@ -88,16 +88,15 @@ module ActionController end def reload_application + # Cleanup the application before processing the current request. + ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord) + ActiveSupport::Dependencies.clear + ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord) + # Run prepare callbacks before every request in development mode run_callbacks :prepare_dispatch Routing::Routes.reload - - # Cleanup the application by clearing out loaded classes so they can - # be reloaded on the next request without restarting the server. - ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord) - ActiveSupport::Dependencies.clear - ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord) end def flush_logger -- cgit v1.2.3