ensure exhausted inputstreams are always closed so we don't hold file…

… locks on windows, fixes clojure-clutchgh-2
kaitanie · Dec 13, 2011 · 001eba2 · 001eba2
1 parent f407bad
commit 001eba2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/com/ashafa/clutch.clj b/src/com/ashafa/clutch.clj
@@ -217,7 +217,8 @@
                                       (assoc m (keyword filename)
                                         {:content_type mime
                                          :data (-> data
-                                                 utils/to-byte-array
+                                                 ; make sure streams are closed so we don't hold locks on files on Windows
+                                                 (#(with-open [stream %] (utils/to-byte-array stream)))
                                                  utils/encode-bytes-to-base64)}))
                                     {})
                             (hash-map :_attachments))))

diff --git a/src/com/ashafa/clutch/http_client.clj b/src/com/ashafa/clutch/http_client.clj
@@ -51,7 +51,8 @@
   [^URLConnection connection data]
   (with-open [output (.getOutputStream connection)]
     (io/copy data output)
-    (if (instance? InputStream data) (.close ^InputStream data))))
+    ; make sure streams are closed so we don't hold locks on files on Windows
+    (when (instance? InputStream data) (.close ^InputStream data))))
 
 (defn- get-response
   [^HttpURLConnection connection {:keys [read-json-response]}]