mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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
This commit is contained in:
parent
c40b1a4a67
commit
c0657a9084
2 changed files with 3 additions and 1 deletions
|
@ -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]
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue