Changeset 2218

Timestamp:

09/12/05 14:41:51 (3 years ago)

Author:

ulysses

Message:

Fixed dependencies related infinite recursion bug when a controller file does not contain a controller class. Closes #1760.

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/dependencies.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed dependencies related infinite recursion bug when a controller file does not contain a controller class. Closes #1760. [rcolli2@tampabay.rr.com]
-
-* Fixed inflections for status, quiz, move #2056 [deirdre@deirdre.net]

trunk/activesupport/lib/active_support/dependencies.rb

@@ -94 +94 @@
-          break
-        when File.file?(fs_path)
-
+loaded_file = 
-          
-          # Import the loaded constant from Object provided we are the root node.
-          self.const_set(name, Object.const_get(name)) if self.root? && Object.const_defined?(name)
+          
+          # Throw an error if we load the file but we don't find the Object we expect
+          if loaded_file and not self.const_defined?(name)
+            msg = "Already loaded file '#{fs_path}' but '#{name.to_s}' was not set, perhaps you need to rename '#{fs_path}'?"
+            raise LoadError, msg
+          end
-          break
-        end