Skip to content

Commit

Permalink
Revert "Properly cache value when it is "false""
Browse files Browse the repository at this point in the history
This reverts commit 551f313.

Reason: see
rails#2010 (comment)
  • Loading branch information
jonleighton committed Nov 14, 2011
1 parent b015d92 commit e52dc33
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
4 changes: 2 additions & 2 deletions activesupport/lib/active_support/cache.rb
Expand Up @@ -555,7 +555,7 @@ def initialize(value, options = {})
@expires_in = options[:expires_in]
@expires_in = @expires_in.to_f if @expires_in
@created_at = Time.now.to_f
if defined?(value)
if value
if should_compress?(value, options)
@value = Zlib::Deflate.deflate(Marshal.dump(value))
@compressed = true
Expand All @@ -574,7 +574,7 @@ def raw_value

# Get the value stored in the cache.
def value
if defined?(@value)
if @value
val = compressed? ? Marshal.load(Zlib::Inflate.inflate(@value)) : @value
unless val.frozen?
val.freeze rescue nil
Expand Down
5 changes: 0 additions & 5 deletions activesupport/test/caching_test.rb
Expand Up @@ -188,11 +188,6 @@ def test_should_read_and_write_nil
assert_equal nil, @cache.read('foo')
end

def test_should_read_and_write_false
assert_equal true, @cache.write('foo', false)
assert_equal false, @cache.read('foo')
end

def test_read_multi
@cache.write('foo', 'bar')
@cache.write('fu', 'baz')
Expand Down

0 comments on commit e52dc33

Please sign in to comment.