Merge pull request #70 from yosiat/empty_contents

Fixes #69 - check if the encoded base64 string is not empty.
Raynes · Dec 22, 2014 · 590cdd6 · 590cdd6
2 parents e07c13a + 203d503
commit 590cdd6
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/tentacles/repos.clj b/src/tentacles/repos.clj
@@ -422,11 +422,13 @@
   ([res str? path]
      (if (and (map? res) (= (:encoding res) "base64"))
        (if-let [^String encoded (get-in res path)]
-         (let [trimmed (.replace encoded "\n" "")
-               raw (.getBytes trimmed "UTF-8")
-               decoded (if (seq raw) (b64/decode raw) (byte-array))
-               done (if str? (String. decoded "UTF-8") decoded)]
-           (assoc-in res path done))
+         (if (not (empty? encoded))
+           (let [trimmed (.replace encoded "\n" "")
+                 raw (.getBytes trimmed "UTF-8")
+                 decoded (if (seq raw) (b64/decode raw) (byte-array))
+                 done (if str? (String. decoded "UTF-8") decoded)]
+             (assoc-in res path done))
+           res)
          res)
        res))
   ([res str?] (decode-b64 res str? [:content]))