From c96382a71a77505ea2f51e43bc81fdb3ac95d117 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Thu, 5 Feb 2009 16:39:32 -0600
Subject: Make sure all autoload constants are pulled in when using
 config.threadsafe! [#1831 state:resolved]

---
 railties/lib/initializer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

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
-- 
cgit v1.2.3