aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-08-07 17:00:03 +0000
committerRick Olson <technoweenie@gmail.com>2006-08-07 17:00:03 +0000
commitc0657a9084825f7ca7b0277e5f07a7ae26b8a126 (patch)
tree76e87254a9ac89fb96f11f9b31bd5f391c41f7c5 /railties/lib
parentc40b1a4a67ccaa3be31edb13399d93da0c628567 (diff)
downloadrails-c0657a9084825f7ca7b0277e5f07a7ae26b8a126.tar.gz
rails-c0657a9084825f7ca7b0277e5f07a7ae26b8a126.tar.bz2
rails-c0657a9084825f7ca7b0277e5f07a7ae26b8a126.zip
Fix Dispatcher.reset_application! so that AR subclasses are removed and Observers re-initialized *after* Reloadable classes are removed. Closes #5743. [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4716 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/dispatcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index a125018446..b62a497207 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -55,8 +55,8 @@ class Dispatcher
# to restart the server (WEBrick, FastCGI, etc.).
def reset_application!
Dependencies.clear
- ActiveRecord::Base.reset if defined?(ActiveRecord)
Class.remove_class(*Reloadable.reloadable_classes)
+ ActiveRecord::Base.reset if defined?(ActiveRecord)
end