luciano/nippy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More robust record deserialization

Browse source
This commit is contained in:
Peter Taoussanis 2015-05-29 14:13:35 +07:00
parent f74d2dcea6
commit 53714cc192
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/taoensso/nippy.clj
View file

@ -461,6 +461,7 @@
(encore/repeatedly-into* ~coll (quot (.readInt in#) 2) (encore/repeatedly-into* ~coll (quot (.readInt in#) 2)
[(thaw-from-in in#) (thaw-from-in in#)]))) [(thaw-from-in in#) (thaw-from-in in#)])))
(def ^:private class-method-sig (into-array Class [IPersistentMap]))
(declare ^:private custom-readers) (declare ^:private custom-readers)
(defn- read-custom! [type-id in] (defn- read-custom! [type-id in]
@ -553,10 +554,17 @@
(bigint (read-biginteger in))) (bigint (read-biginteger in)))
id-record id-record
(let [class ^Class (Class/forName (read-utf8 in)) (let [class-name (read-utf8 in)
meth-sig (into-array Class [IPersistentMap]) content (thaw-from-in in)]
method ^Method (.getMethod class "create" meth-sig)] (try
(.invoke method class (into-array Object [(thaw-from-in in)]))) (let [class (Class/forName class-name)
method (.getMethod class "create" class-method-sig)]
(.invoke method class (into-array Object [content])))
(catch Exception e
{:nippy/unthawable class-name
:type :record
:content content
:throwable e})))
id-date (Date. (.readLong in)) id-date (Date. (.readLong in))
id-uuid (UUID. (.readLong in) (.readLong in)) id-uuid (UUID. (.readLong in) (.readLong in))