diff options
| author | Rick Olson <technoweenie@gmail.com> | 2006-08-07 17:00:03 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2006-08-07 17:00:03 +0000 |
| commit | c0657a9084825f7ca7b0277e5f07a7ae26b8a126 (patch) | |
| tree | 76e87254a9ac89fb96f11f9b31bd5f391c41f7c5 | |
| parent | c40b1a4a67ccaa3be31edb13399d93da0c628567 (diff) | |
| download | rails-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
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/dispatcher.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 92d8a8bbe7..50daa2f009 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix Dispatcher.reset_application! so that AR subclasses are removed and Observers re-initialized *after* Reloadable classes are removed. Closes #5743. [Rick Olson] + * Clarify usage of script/plugin source. Closes #5344. [james.adam@gmail.com] * Add Dispatcher.to_prepare and config.to_prepare to provide a pre-request hook. [Nicholas Seckar] 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 |