Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Nuke the controllers after the dispatcher reload to avoid the supercl…

…ass mismatch problem

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@323 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit b3739fca2c185831c97efdd9fdcaa23476863539 1 parent 612bb73
@dhh dhh authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  railties/lib/dispatcher.rb
View
2  railties/lib/dispatcher.rb
@@ -41,9 +41,9 @@ def self.dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest:
ActionController::Base.process_with_exception(request, response, exception).out
ensure
if Dependencies.mechanism == :load
- remove_class_hierarchy(controller_class(controller_name), ActionController::Base)
ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
Dependencies.reload rescue nil # Ignore out of order reloading errors for Controllers
+ remove_class_hierarchy(controller_class(controller_name), ActionController::Base)
end
Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)

0 comments on commit b3739fc

Please sign in to comment.
Something went wrong with that request. Please try again.