diff options
| -rw-r--r-- | railties/lib/dispatcher.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index eed6db574f..2cbc42eaff 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -48,9 +48,13 @@ class Dispatcher private def reset_application(controller_name) - ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses - Dependencies.clear - remove_class_hierarchy(controller_class(controller_name), ActionController::Base) + begin + ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses + Dependencies.clear + remove_class_hierarchy(controller_class(controller_name), ActionController::Base) + rescue Object => exception + # Compilation errors are caught on the first run through + end end def controller_path(controller_name, module_name = nil) |