@@ -282,6 +282,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader Merb.load_paths.each do |name, path| next unless path.last && name != :application Dir[path.first / path.last].each do |file| + begin load_file file rescue NameError => ne @@ -300,7 +301,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader klasses = ObjectSpace.classes.dup load file LOADED_CLASSES[file] = ObjectSpace.classes - klasses - MTIMES[file] = File.mtime(file) + MTIMES[file] = File.mtime(file) end # "Better loading" of classes. If a class fails to load due to a NameError @@ -321,7 +322,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader klasses.each do |klass| klasses.delete(klass) begin - require klass + load_file klass rescue NameError => ne failed_classes.push(klass) end @@ -460,8 +461,8 @@ class Merb::BootLoader::MixinSessionContainer < Merb::BootLoader elsif reg = Merb.registered_session_types[session_store] if session_store == "cookie" Merb::BootLoader::MixinSessionContainer.check_for_secret_key + Merb::BootLoader::MixinSessionContainer.check_for_session_id_key end - Merb::BootLoader::MixinSessionContainer.check_for_session_id_key require reg[:file] include ::Merb::SessionMixin Merb.logger.warn reg[:description] lib/merb-core/bootloader.rb 2f1555c55cd6957a1fc245a1daf079de7cb7c1dc Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/ff17f772b2bd30f8d57c9aa6920d4b0e83dd1d48 ff17f772b2bd30f8d57c9aa6920d4b0e83dd1d48 2008-03-10T12:10:46-07:00 2008-03-10T12:10:46-07:00 Fixed critical bug in LoadClasses BootLoader concerning reloading MTIMES weren't recorded for any class loaded by load_classes_with_requirements; instead of load_file, which records the File.mtime, it used a regular require. So when referencing known classes in the ReloadClasses.reload method, for those files nil was returned, causing MTIMES[file] to be unequal to File.mtime(file) - and so each of these files was reloaded at each interval, without them actually being changed. f20ac7b4b5bda24265f0aea95d869b6412e0dc3b Fabien Franzen info@atelierfabien.be