From e8eb743ba679ccfe13e3cd15f140b539f1562340 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 1 Dec 2006 05:37:56 +0000 Subject: Replace the elaborate reloading connection checking scheme, just fix the Ruby-based MySQL adapter, ye? git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5656 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/dispatcher.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'railties') diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 31eb5d2317..ce6f505895 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -62,7 +62,7 @@ class Dispatcher Class.remove_class(*Reloadable.reloadable_classes) end - ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord) + ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord) end # Add a preparation callback. Preparation callbacks are run before every @@ -76,16 +76,13 @@ class Dispatcher def to_prepare(identifier = nil, &block) unless identifier.nil? callback = preparation_callbacks.detect { |ident, _| ident == identifier } - if callback # Already registered: update the existing callback callback[-1] = block return end end - preparation_callbacks << [identifier, block] - - return + nil end private -- cgit v1.2.3