@@ -380,7 +380,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader @ran = true $0 = "merb: master" - if Merb::Config[:fork_for_class_load] && !Merb.env == "test" + if Merb::Config[:fork_for_class_load] && Merb.env != "test" start_transaction else trap('INT') do lib/merb-core/bootloader.rb 7d800b90cf19a1d77ef5a1669b8716cfc1c55e8e 247779ebe96100b49690581801a897636e72b36a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9d0f3671aaa57a5e897af8b5768fd378642ec41c 9d0f3671aaa57a5e897af8b5768fd378642ec41c 2008-09-27T22:19:53-07:00 2008-09-27T22:19:53-07:00 Merge branch 'forking_bootloader' into forking_runner 9861981da20421a75748e9ecbb05f1390e459e0a Yehuda Katz wycats@gmail.com