Merge branch 'master' of git@github.com:rails/rails

1 files changed, 22 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/routing/recognition_optimisation.rb b/actionpack/lib/action_controller/routing/recognition_optimisation.rb
index 6d54d0334c..4935432d87 100644
--- a/actionpack/lib/action_controller/routing/recognition_optimisation.rb
+++ b/actionpack/lib/action_controller/routing/recognition_optimisation.rb
@@ -134,6 +134,9 @@ module ActionController
         def write_recognize_optimized!
           tree = segment_tree(routes)
           body = generate_code(tree)
+
+          remove_recognize_optimized!
+
           instance_eval %{
             def recognize_optimized(path, env)
               segments = to_plain_segments(path)
@@ -147,6 +150,25 @@ module ActionController
             end
           }, __FILE__, __LINE__
         end
+
+        def clear_recognize_optimized!
+          remove_recognize_optimized!
+
+          class << self
+            def recognize_optimized(path, environment)
+              write_recognize_optimized!
+              recognize_optimized(path, environment)
+            end
+          end
+        end
+
+        def remove_recognize_optimized!
+          if respond_to?(:recognize_optimized)
+            class << self
+              remove_method :recognize_optimized
+            end
+          end
+        end
     end
   end
 end