Fix a couple failures on 1.9.1.

2 files changed, 7 insertions, 5 deletions

diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 6461b76d3d..5cc5b4ae88 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -17,7 +17,7 @@ module Rails
 
       initializer :add_builtin_route do |app|
         if Rails.env.development?
-          RoutesReloader.paths << File.join(RAILTIES_PATH, 'builtin', 'routes.rb')
+          Rails::Application::RoutesReloader.paths << File.join(RAILTIES_PATH, 'builtin', 'routes.rb')
         end
       end
 
diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
index 98f7f774a9..7e8fd027e6 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -23,9 +23,11 @@ def new_session
   session
 end
 
-#reloads the environment
-def reload!
-  puts "Reloading..."
-  ActionDispatch::Callbacks.new(lambda {}, true).call({})
+# reloads the environment
+def reload!(print=true)
+  puts "Reloading..." if print
+  ActionDispatch::Callbacks.new(lambda {}, false)
   true
 end
+
+reload!(false)