diff options
Diffstat (limited to 'activesupport/lib/active_support/cache.rb')
| -rw-r--r-- | activesupport/lib/active_support/cache.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 7d032ca984..6ba0a600b1 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -578,7 +578,17 @@ module ActiveSupport # it is marshalled and eventually compressed. Both operations yield # strings. if @value - Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value) + # In rails 3.1 and earlier values in entries did not marshaled without + # options[:compress] and if it's Numeric. + # But after commit a263f377978fc07515b42808ebc1f7894fafaa3a + # all values in entries are marshalled. And after that code below expects + # that all values in entries will be marshaled (and will be strings). + # So here we need a check for old ones. + begin + Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value) + rescue + compressed? ? Zlib::Inflate.inflate(@value) : @value + end end end |