diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-02-05 16:39:32 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-02-05 16:39:32 -0600 |
| commit | c96382a71a77505ea2f51e43bc81fdb3ac95d117 (patch) | |
| tree | 077a1017aa4ba8ffeb3d5a557030cc90ae4ae6e1 /railties/lib/initializer.rb | |
| parent | dcc2407d9976740cebe6736ec6adeae269b81203 (diff) | |
| download | rails-c96382a71a77505ea2f51e43bc81fdb3ac95d117.tar.gz rails-c96382a71a77505ea2f51e43bc81fdb3ac95d117.tar.bz2 rails-c96382a71a77505ea2f51e43bc81fdb3ac95d117.zip | |
Make sure all autoload constants are pulled in when using config.threadsafe! [#1831 state:resolved]
Diffstat (limited to 'railties/lib/initializer.rb')
| -rw-r--r-- | railties/lib/initializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index da064c86aa..e3811dd8be 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -132,10 +132,10 @@ module Rails add_gem_load_paths require_frameworks - preload_frameworks set_autoload_paths add_plugin_load_paths load_environment + preload_frameworks initialize_encoding initialize_database @@ -270,7 +270,7 @@ module Rails configuration.frameworks.each do |framework| # String#classify and #constantize aren't available yet. toplevel = Object.const_get(framework.to_s.gsub(/(?:^|_)(.)/) { $1.upcase }) - toplevel.load_all! + toplevel.load_all! if toplevel.respond_to?(:load_all!) end end end |