Merge pull request #4189 from bogdan/non_keyed_callbacks

AS::Callbacks: improved __define_runner performance
rails · Dec 25, 2011 · e33c946 · e33c946
2 parents 748725e + 7e75dc5
commit e33c946
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
@@ -381,9 +381,8 @@ def __define_runner(symbol) #:nodoc:
         name = __callback_runner_name(nil, symbol)
         undef_method(name) if method_defined?(name)
 
-        silence_warnings do
+        runner_method = "_run_#{symbol}_callbacks" 
-          runner_method = "_run_#{symbol}_callbacks" 
+        unless private_method_defined?(runner_method)
-          undef_method runner_method if method_defined?(runner_method)
           class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
             def #{runner_method}(key = nil, &blk)
               self.class.__run_callback(key, :#{symbol}, self, &blk)