diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-12 17:03:17 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-12 17:03:17 -0700 |
| commit | 45b79d933cd2433b30ae98e7dadc4ae060e170c9 (patch) | |
| tree | 6bc79848cf6aab926cdcfb51b298fe26b68a0ec0 /activesupport/lib | |
| parent | 992fda16ed662f028700d63a8dcbd1837f1d58ab (diff) | |
| parent | 08b0cf07dbc639c8609118eaeb34330d5168e8b2 (diff) | |
| download | rails-45b79d933cd2433b30ae98e7dadc4ae060e170c9.tar.gz rails-45b79d933cd2433b30ae98e7dadc4ae060e170c9.tar.bz2 rails-45b79d933cd2433b30ae98e7dadc4ae060e170c9.zip | |
Merge branch 'conditional-get'
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/memoizable.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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 |