aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/initializer.rb
diff options
context:
space:
mode:
authorLuke Melia <luke@lukemelia.com>2009-05-30 09:34:57 -0500
committerJoshua Peek <josh@joshpeek.com>2009-05-30 09:35:25 -0500
commit54984f0f245cd67999c23112dfa841a4d0bd66f2 (patch)
treee1228ffe52d284c2f4a8e2b153e87d4d4724872d /railties/lib/initializer.rb
parente7d6f48ea9a70438997219ef86e3a066f3bd005f (diff)
downloadrails-54984f0f245cd67999c23112dfa841a4d0bd66f2.tar.gz
rails-54984f0f245cd67999c23112dfa841a4d0bd66f2.tar.bz2
rails-54984f0f245cd67999c23112dfa841a4d0bd66f2.zip
Avoid loading the ActiveRecord::SessionStore class on initialization if it is not in use [#2737 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'railties/lib/initializer.rb')
-rw-r--r--railties/lib/initializer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index bbaa313fae..7273cea0c5 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -450,7 +450,7 @@ Run `rake gems:install` to install the missing gems.
def initialize_database_middleware
if configuration.frameworks.include?(:active_record)
if configuration.frameworks.include?(:action_controller) &&
- ActionController::Base.session_store == ActiveRecord::SessionStore
+ ActionController::Base.session_store.name == 'ActiveRecord::SessionStore'
configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement
configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache
else