Fixed byte[] support for cmd arguments.

wallrat · Apr 2, 2012 · 69d9f88 · 69d9f88
1 parent ca81e77
commit 69d9f88
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/labs/redis/core.clj b/src/labs/redis/core.clj
@@ -10,6 +10,8 @@
 
 (set! *warn-on-reflection* true)
 
+(def ^:private byte-array-class (Class/forName "[B"))
+
 (defn parse-url [url]
   (let [u (java.net.URI. url)
         ui (.getUserInfo u)
@@ -56,14 +58,14 @@
 (defn value [^Reply reply]
   (.getValue reply))
 
-(let [byte-array-class (Class/forName "[B")]
+
-  (defn ->str
+(defn ->str
-    "Coerces reply into a String."
+  "Coerces reply into a String."
-    [reply]
+  [reply]
-    (condp instance? reply
+  (condp instance? reply
-      byte-array-class (String. ^bytes reply)
+    byte-array-class (String. ^bytes reply)
-      BulkReply (String. (.bytes ^BulkReply reply))
+    BulkReply (String. (.bytes ^BulkReply reply))
-      java.lang.Object (.toString ^java.lang.Object reply))))
+    java.lang.Object (.toString ^java.lang.Object reply)))
 
 (defn ->strs [reply]
   (map ->str (value reply)))
@@ -85,8 +87,7 @@
    (keyword? v) (name v)
    (map? v) (map cmd-arg-convert v)
    (vector? v) (map cmd-arg-convert v)
-   ;; string
+   (instance? byte-array-class v) v
-   ;; byte[]
    :default (.toString ^Object v)))