From 6c70c02c83b3a03c88df4286130be8882f6d201c Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 7 Aug 2008 23:31:43 -0700
Subject: Freeze memoized results when instance is frozen instead of
 immediately so you can memoize mutable objects

---
 activesupport/lib/active_support/memoizable.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
index e6049d9496..b5adc2330c 100644
--- a/activesupport/lib/active_support/memoizable.rb
+++ b/activesupport/lib/active_support/memoizable.rb
@@ -14,7 +14,7 @@ module ActiveSupport
           methods.each do |method|
             if method.to_s =~ /^_unmemoized_(.*)/
               begin
-                __send__($1)
+                __send__($1).freeze
               rescue ArgumentError
               end
             end
@@ -41,7 +41,7 @@ module ActiveSupport
               if !reload && defined? #{memoized_ivar}
                 #{memoized_ivar}
               else
-                #{memoized_ivar} = #{original_method}.freeze
+                #{memoized_ivar} = #{original_method}
               end
             end
           else
@@ -52,7 +52,7 @@ module ActiveSupport
               if !reload && #{memoized_ivar} && #{memoized_ivar}.has_key?(args)
                 #{memoized_ivar}[args]
               else
-                #{memoized_ivar}[args] = #{original_method}(*args).freeze
+                #{memoized_ivar}[args] = #{original_method}(*args)
               end
             end
           end
-- 
cgit v1.2.3