lib/active_support/dependencies.rb in activesupport-3.2.8 vs lib/active_support/dependencies.rb in activesupport-3.2.9.rc1

@@ -496,10 +496,10 @@
       qualified_name = qualified_name_for from_mod, const_name
       path_suffix = qualified_name.underscore
 
       file_path = search_for_file(path_suffix)
 
-      if file_path && ! loaded.include?(File.expand_path(file_path)) # We found a matching file to load
+      if file_path && ! loaded.include?(File.expand_path(file_path).sub(/\.rb\z/, '')) # We found a matching file to load
         require_or_load file_path
         raise LoadError, "Expected #{file_path} to define #{qualified_name}" unless local_const_defined?(from_mod, const_name)
         return from_mod.const_get(const_name)
       elsif mod = autoload_module!(from_mod, const_name, qualified_name, path_suffix)
         return mod