Permalink
Browse files

Make sure all autoload constants are pulled in when using config.thre…

…adsafe! [#1831 state:resolved]
  • Loading branch information...
1 parent dcc2407 commit c96382a71a77505ea2f51e43bc81fdb3ac95d117 @josh josh committed Feb 5, 2009
Showing with 2 additions and 2 deletions.
  1. +2 −2 railties/lib/initializer.rb
@@ -132,10 +132,10 @@ def process
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 @@ def preload_frameworks
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

0 comments on commit c96382a

Please sign in to comment.