Better handling of unmarshalling issues, closes petergoldsteinGH-45

phiggins · Nov 21, 2010 · 1e174d8 · 1e174d8
1 parent 4647382
commit 1e174d8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/dalli/server.rb b/lib/dalli/server.rb
@@ -266,10 +266,10 @@ def deserialize(value, flags)
       value = Zlib::Inflate.inflate(value) if (flags & FLAG_COMPRESSED) != 0
       value = Marshal.load(value) if (flags & FLAG_MARSHALLED) != 0
       value
-    rescue TypeError
-      raise DalliError, "Unable to unmarshal value: '#{value}'"
+    rescue TypeError, ArgumentError
+      raise DalliError, "Unable to unmarshal value: #{$!.message}"
     rescue Zlib::Error
-      raise DalliError, "Unable to uncompress value: '#{value}'"      
+      raise DalliError, "Unable to uncompress value: #{$!.message}"
     end
 
     def cas_response