Skip to content

Commit

Permalink
Merge pull request #279 from tmm1/fix-specs
Browse files Browse the repository at this point in the history
Fix specs
  • Loading branch information
mperham committed Oct 29, 2012
2 parents 3163a02 + 1ac4415 commit d60c636
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/dalli/server.rb
Expand Up @@ -311,7 +311,7 @@ def deserialize(value, flags)
value = Dalli.serializer.load(value) if (flags & FLAG_SERIALIZED) != 0
value
rescue TypeError
raise if $!.message !~ /needs to have method `_load'|exception class\/object expected|instance of IO needed/
raise if $!.message !~ /needs to have method `_load'|exception class\/object expected|instance of IO needed|incompatible marshal file format/
raise UnmarshalError, "Unable to unmarshal value: #{$!.message}"
rescue ArgumentError
raise if $!.message !~ /undefined class|marshal data too short/
Expand Down

0 comments on commit d60c636

Please sign in to comment.