Permalink
Browse files

Only nuke the AbstractApplicationController if its available

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@79 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 554597d commit 4e1eaa289b8e410277a8dfb9a0c5139cafcbb23e @dhh dhh committed Dec 8, 2004
Showing with 1 addition and 1 deletion.
  1. +1 −1 railties/lib/dispatcher.rb
@@ -41,7 +41,7 @@ def self.dispatch(cgi = CGI.new, session_options = DEFAULT_SESSION_OPTIONS)
ActiveRecord::Base.reset_associations_loaded
if ActionController::Base.reload_dependencies
- Object.send(:remove_const, "AbstractApplicationController")
+ Object.send(:remove_const, "AbstractApplicationController") if Object.const_defined?(:AbstractApplicationController)
Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name))
end
end

0 comments on commit 4e1eaa2

Please sign in to comment.