diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-21 03:44:06 -0800 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-21 03:44:06 -0800 |
commit | 67a5157974ed9809570e2b29b69b59b85a4c7c52 (patch) | |
tree | 93d7690a6994ca1042f55ca65aae2638c77c776e /activesupport/lib/active_support | |
parent | e7c6cd308e9dfa6ebd4b231548d82bc05760e3b7 (diff) | |
parent | f0baa1c301d3206dbca9ad35c5260d8070497302 (diff) | |
download | rails-67a5157974ed9809570e2b29b69b59b85a4c7c52.tar.gz rails-67a5157974ed9809570e2b29b69b59b85a4c7c52.tar.bz2 rails-67a5157974ed9809570e2b29b69b59b85a4c7c52.zip |
Merge pull request #5112 from nupurjain/activesupport_cache_refactor
suggested changes.
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r-- | activesupport/lib/active_support/cache.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 26e737e917..d7408eff9f 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -382,11 +382,7 @@ module ActiveSupport options = merged_options(options) instrument(:exist?, name) do |payload| entry = read_entry(namespaced_key(name, options), options) - if entry && !entry.expired? - true - else - false - end + entry && !entry.expired? end end |