From 08cc49b919cfa43a19f55b761dba56bc3673b6b7 Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Thu, 10 Nov 2011 16:42:27 +0200
Subject: AS::Callbacks.__run_keyed_callback: remove unused cache

---
 activesupport/lib/active_support/callbacks.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 31737d54cb..962299bf7c 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -394,16 +394,12 @@ module ActiveSupport
       #
       def __run_keyed_callback(key, kind, object, &blk) #:nodoc:
         name = "_run__#{self.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
-        unless respond_to?(name)
-          @_keyed_callbacks ||= {}
-          @_keyed_callbacks[name] ||= begin
-            str = send("_#{kind}_callbacks").compile(name, object)
-            class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-              def #{name}() #{str} end
-              protected :#{name}
-            RUBY_EVAL
-            true
-          end
+        unless object.respond_to?(name)
+          str = send("_#{kind}_callbacks").compile(name, object)
+          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+            def #{name}() #{str} end
+            protected :#{name}
+          RUBY_EVAL
         end
         object.send(name, &blk)
       end
-- 
cgit v1.2.3