Housekeeping

This commit is contained in:
Peter Taoussanis 2013-10-19 12:50:21 +07:00
parent 9ec2894e92
commit 512aca32aa

View file

@ -7,8 +7,8 @@
(utils :as utils) (utils :as utils)
(compression :as compression :refer (snappy-compressor)) (compression :as compression :refer (snappy-compressor))
(encryption :as encryption :refer (aes128-encryptor))]) (encryption :as encryption :refer (aes128-encryptor))])
(:import [java.io DataInputStream DataOutputStream ByteArrayOutputStream (:import [java.io ByteArrayInputStream ByteArrayOutputStream DataInputStream
ByteArrayInputStream] DataOutputStream]
[java.lang.reflect Method] [java.lang.reflect Method]
[java.util Date UUID] [java.util Date UUID]
[clojure.lang Keyword BigInt Ratio PersistentQueue PersistentTreeMap [clojure.lang Keyword BigInt Ratio PersistentQueue PersistentTreeMap
@ -209,10 +209,10 @@
:or {compressor snappy-compressor :or {compressor snappy-compressor
encryptor aes128-encryptor}}]] encryptor aes128-encryptor}}]]
(when legacy-mode (assert-legacy-args compressor password)) (when legacy-mode (assert-legacy-args compressor password))
(let [ba (ByteArrayOutputStream.) (let [bas (ByteArrayOutputStream.)
stream (DataOutputStream. ba)] ds (DataOutputStream. bas)]
(freeze-to-stream! stream x) (freeze-to-stream! ds x)
(let [ba (.toByteArray ba) (let [ba (.toByteArray bas)
ba (if compressor (compression/compress compressor ba) ba) ba (if compressor (compression/compress compressor ba) ba)
ba (if password (encryption/encrypt encryptor password ba) ba)] ba (if password (encryption/encrypt encryptor password ba) ba)]
(if legacy-mode ba (if legacy-mode ba