1 files changed, 5 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb
index 781bc48887..e91babde10 100644
--- a/actionpack/lib/action_controller/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatcher.rb
@@ -7,7 +7,6 @@ module ActionController
         unless cache_classes
           # Development mode callbacks
           before_dispatch :reload_application
-          after_dispatch :cleanup_application
 
           ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
         end
@@ -89,20 +88,17 @@ 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
     end
 
-    # Cleanup the application by clearing out loaded classes so they can
-    # be reloaded on the next request without restarting the server.
-    def cleanup_application
-      ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
-      ActiveSupport::Dependencies.clear
-      ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord)
-    end
-
     def flush_logger
       Base.logger.flush
     end