Tried delaying database disconnect until after dependency resolution (references #6687, #6700) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5627 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 3 insertions, 5 deletions

diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 3ac1b6c17a..ce6f505895 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -55,18 +55,16 @@ class Dispatcher
     # mailers, and so forth. This allows them to be loaded again without having
     # to restart the server (WEBrick, FastCGI, etc.).
     def reset_application!
-      if defined?(ActiveRecord)
-        ActiveRecord::Base.reset_subclasses
-        ActiveRecord::Base.clear_active_connections!
-      end
+      ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
 
       Dependencies.clear
       ActiveSupport::Deprecation.silence do # TODO: Remove after 1.2
         Class.remove_class(*Reloadable.reloadable_classes)
       end
+        
+      ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord)
     end
     
-    
     # Add a preparation callback. Preparation callbacks are run before every
     # request in development mode, and before the first request in production
     # mode.