From c1d48c7ef9238d7706d7f7be76ba76c1f3126718 Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Tue, 26 Jul 2016 12:05:52 +0700 Subject: [PATCH] Hotfix: missing thaw routines for deprecated type ids: 6, 80 Ref. https://github.com/ptaoussanis/faraday/issues/98 --- src/taoensso/nippy.clj | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/taoensso/nippy.clj b/src/taoensso/nippy.clj index 6e8dd95..4a205bc 100644 --- a/src/taoensso/nippy.clj +++ b/src/taoensso/nippy.clj @@ -1196,16 +1196,18 @@ id-uuid (UUID. (.readLong in) (.readLong in)) ;; Deprecated ------------------------------------------------------ - id-boolean-depr1 (.readBoolean in) - id-sorted-map-depr1 (read-kvs-depr1 (sorted-map) in) - id-map-depr2 (read-kvs-depr1 {} in) - id-reader-depr1 (read-edn (.readUTF in)) - id-reader-depr2 (read-edn (read-utf8 in (.readInt in))) - id-str-depr1 (.readUTF in) - id-kw-depr1 (keyword (.readUTF in)) - id-map-depr1 (apply hash-map - (enc/repeatedly-into [] (* 2 (.readInt in)) - (fn [] (thaw-from-in! in)))) + id-boolean-depr1 (.readBoolean in) + id-sorted-map-depr1 (read-kvs-depr1 (sorted-map) in) + id-map-depr2 (read-kvs-depr1 {} in) + id-reader-depr1 (read-edn (.readUTF in)) + id-reader-depr2 (read-edn (read-utf8 in (.readInt in))) + id-str-depr1 (.readUTF in) + id-kw-depr1 (keyword (.readUTF in)) + id-map-depr1 (apply hash-map + (enc/repeatedly-into [] (* 2 (.readInt in)) + (fn [] (thaw-from-in! in)))) + id-serializable-depr1 (read-serializable in (read-utf8 in (read-lg-count in))) + id-record-depr1 (read-record in (read-utf8 in (read-lg-count in))) ;; ----------------------------------------------------------------- id-prefixed-custom (read-custom! in :prefixed (.readShort in))