diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-07-24 09:56:20 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-07-24 09:56:20 +0930 |
| commit | 40ce686b5732d0e3281c53e7a06d4d3f39a414ab (patch) | |
| tree | 22fd17357aba0c04d6127dd906934a5d5339dd31 /railties | |
| parent | 430b7c8b518fc628f2647323ba2bbb8dbb6cdd35 (diff) | |
| parent | 5d6770754e1a4364ccfd476412d9abb538baf936 (diff) | |
| download | rails-40ce686b5732d0e3281c53e7a06d4d3f39a414ab.tar.gz rails-40ce686b5732d0e3281c53e7a06d4d3f39a414ab.tar.bz2 rails-40ce686b5732d0e3281c53e7a06d4d3f39a414ab.zip | |
Merge pull request #20928 from matthewd/unload-interlock
We need stricter locking before we can unload
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application/finisher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index f8f92792a7..404e3c3e23 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -86,7 +86,7 @@ module Rails # added in the hook are taken into account. initializer :set_clear_dependencies_hook, group: :all do callback = lambda do - ActiveSupport::Dependencies.interlock.attempt_loading do + ActiveSupport::Dependencies.interlock.attempt_unloading do ActiveSupport::DescendantsTracker.clear ActiveSupport::Dependencies.clear end |