From 6331b4eb44a6cdd5879c787db7ad46be737e81c8 Mon Sep 17 00:00:00 2001 From: Andrew White Date: Fri, 6 Feb 2009 17:22:55 +0000 Subject: [PATCH] Move cleanup before prepare_dispatch so that constants are not loaded twice --- actionpack/lib/action_controller/dispatcher.rb | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index 9374a7f..e91babd 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 -- 1.5.4.5