Sever infinite loop for mutual dependencies. Closes #2997.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3181 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 15 insertions, 7 deletions

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index be44f61ea7..bce5855c4a 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -45,18 +45,26 @@ module Dependencies #:nodoc:
       # Append .rb if we have a bare file name.
       load_file_name = (file_name =~ /\.rb$/ ? file_name : "#{file_name}.rb")
 
-      # Enable warnings iff this file has not been loaded before.
-      if history.include?(file_name)
-        load load_file_name
-      else
-        enable_warnings { load load_file_name }
+      # Record that we've seen this file *before* loading it to avoid an
+      # infinite loop with mutual dependencies.
+      loaded << file_name
+
+      begin
+        # Enable warnings iff this file has not been loaded before.
+        if history.include?(file_name)
+          load load_file_name
+        else
+          enable_warnings { load load_file_name }
+        end
+      rescue
+        loaded.delete file_name
+        raise
       end
     else
       require file_name
     end
 
-    # Record that we've seen this file.
-    loaded  << file_name
+    # Record history *after* loading so first load gets warnings.
     history << file_name
   end