1 files changed, 16 insertions, 5 deletions
diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb
index 1d1f5e1b06..6f9a200aa9 100644
--- a/railties/lib/rails/application/routes_reloader.rb
+++ b/railties/lib/rails/application/routes_reloader.rb
@@ -1,10 +1,13 @@
+require "active_support/core_ext/module/delegation"
+
 module Rails
   class Application
-    class RoutesReloader < ::ActiveSupport::FileUpdateChecker
-      attr_reader :route_sets
+    class RoutesReloader
+      attr_reader :route_sets, :paths
+      delegate :execute_if_updated, :execute, :updated?, :to => :updater
 
       def initialize
-        super([]) { reload! }
+        @paths      = []
         @route_sets = []
       end
 
@@ -16,7 +19,15 @@ module Rails
         revert
       end
 
-    protected
+    private
+
+      def updater
+        @updater ||= begin
+          updater = ActiveSupport::FileUpdateChecker.new(paths) { reload! }
+          updater.execute
+          updater
+        end
+      end
 
       def clear!
         route_sets.each do |routes|
@@ -31,7 +42,7 @@ module Rails
 
       def finalize!
         route_sets.each do |routes|
-          ActiveSupport.on_load(:action_controller) { routes.finalize! }
+          routes.finalize!
         end
       end