diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-02-01 19:42:14 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-02-02 03:21:02 +1030 |
| commit | 92203edbe6546f84921b6ccb6e79c3a01857a8b3 (patch) | |
| tree | dbc8f21ff50d02def39d5c00f2f769d6fc96d251 /railties/lib/rails | |
| parent | 8a51f6fbbf720db9edce3e1c973a9f8c5ee7931c (diff) | |
| download | rails-92203edbe6546f84921b6ccb6e79c3a01857a8b3.tar.gz rails-92203edbe6546f84921b6ccb6e79c3a01857a8b3.tar.bz2 rails-92203edbe6546f84921b6ccb6e79c3a01857a8b3.zip | |
Always obtain the lock and do the unload
We mostly care about `reload_classes_only_on_change=true`, because
that's the default... and there, we definitely need to wait for the lock
when necessary.
Diffstat (limited to 'railties/lib/rails')
| -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 404e3c3e23..411cdbad19 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_unloading do + ActiveSupport::Dependencies.interlock.unloading do ActiveSupport::DescendantsTracker.clear ActiveSupport::Dependencies.clear end |