From 05907403dc663cb054d44fc89549e146dca4ed31 Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Wed, 7 Aug 2013 16:19:11 +0700 Subject: [PATCH] Revert 8e4cc07 (unnecessary, slower) --- src/taoensso/nippy.clj | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/taoensso/nippy.clj b/src/taoensso/nippy.clj index 0c98847..f2969b8 100644 --- a/src/taoensso/nippy.clj +++ b/src/taoensso/nippy.clj @@ -94,11 +94,7 @@ (when-let [m# (meta x#)] (write-id s# ~id-meta) (freeze-to-stream* m# s#)) - (try (freeze-to-stream* x# s#) - (catch java.lang.IllegalArgumentException _# - ;; Use Clojure reader as final fallback (after custom extensions) - (write-id s# id-reader) - (write-bytes s# (.getBytes (pr-str x#) "UTF-8")))))) + (freeze-to-stream* x# s#))) (defn freeze-to-stream! "Low-level API. Serializes arg (any Clojure data type) to a DataOutputStream." @@ -180,6 +176,9 @@ (.writeLong s (.getMostSignificantBits x)) (.writeLong s (.getLeastSignificantBits x))) +;; Use Clojure's own reader as final fallback +(freezer Object id-reader (write-bytes s (.getBytes (pr-str x) "UTF-8"))) + (def ^:private head-meta-id (reduce-kv #(assoc %1 %3 %2) {} head-meta)) (defn- wrap-header [data-ba metadata]