diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:44:34 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:44:34 +0000 |
| commit | 4635d33996eaa2158e5149871af17a8612949614 (patch) | |
| tree | 9e010ba97caf7d34e2599cd45d2b0e48a0ea6192 /activesupport/lib/active_support/dependencies.rb | |
| parent | 74165eb6acaca98d4da13409c4e5b5ecc9d260f7 (diff) | |
| download | rails-4635d33996eaa2158e5149871af17a8612949614.tar.gz rails-4635d33996eaa2158e5149871af17a8612949614.tar.bz2 rails-4635d33996eaa2158e5149871af17a8612949614.zip | |
Checkin forgotten add. Update const_missing handler to avoid double loading files.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4729 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index e845408137..f5d047ee07 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -155,7 +155,7 @@ module Dependencies #:nodoc: name_error = NameError.new("uninitialized constant #{qualified_name}") file_path = search_for_autoload_file(path_suffix) - if file_path # We found a matching file to load + if file_path #&& ! loaded.include?(file_path) # We found a matching file to load require_or_load file_path, qualified_name raise LoadError, "Expected #{file_path} to define #{qualified_name}" unless from_mod.const_defined?(const_name) return from_mod.const_get(const_name) |