Warn about thaw-id reset at runtime rather than expansion time

taoensso · Jun 1, 2015 · 13f03c7 · 13f03c7
1 parent ba87aa7
commit 13f03c7
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/src/taoensso/nippy.clj b/src/taoensso/nippy.clj
@@ -768,20 +768,22 @@
     (->MyType (.readUTF data-input)))"
   [custom-type-id [in] & body]
   (assert-custom-type-id custom-type-id)
-  (when (contains? *custom-readers* (coerce-custom-type-id custom-type-id))
-    (println (format "Warning: resetting Nippy thaw for custom type with id: %s"
-               custom-type-id)))
-  `(swap-custom-readers!
-     (fn [m#]
-       (assoc m#
-         ~(coerce-custom-type-id custom-type-id)
-         (fn [~(with-meta in {:tag 'java.io.DataInput})]
-           ~@body)))))
-
-(comment (defrecord MyType [data])
-         (extend-freeze MyType 1 [x out] (.writeUTF out (:data x)))
-         (extend-thaw 1 [in] (->MyType (.readUTF in)))
-         (thaw (freeze (->MyType "Joe"))))
+  `(do
+     (when (contains? *custom-readers* ~(coerce-custom-type-id custom-type-id))
+       (println (format "Warning: resetting Nippy thaw for custom type with id: %s"
+                  ~custom-type-id)))
+     (swap-custom-readers!
+       (fn [m#]
+         (assoc m#
+           ~(coerce-custom-type-id custom-type-id)
+           (fn [~(with-meta in {:tag 'java.io.DataInput})]
+             ~@body))))))
+
+(comment
+  (defrecord MyType [data])
+  (extend-freeze MyType 1 [x out] (.writeUTF out (:data x)))
+  (extend-thaw 1 [in] (->MyType (.readUTF in)))
+  (thaw (freeze (->MyType "Joe"))))
 
 ;;; Some useful custom types - EXPERIMENTAL