Merge branch 'master' into performance

jasonjckn · Jan 2, 2011 · 56533b5 · 56533b5
2 parents 4cb11d0 + 9603320
commit 56533b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/gloss/data/bytes/.#core.clj b/src/gloss/data/bytes/.#core.clj
@@ -0,0 +1 @@
+zach@thrush.local.30365
diff --git a/src/gloss/data/bytes/delimited.clj b/src/gloss/data/bytes/delimited.clj
@@ -128,7 +128,7 @@
 	    (doseq [v vs]
 	      (write-bytes codec buf v))
 	    (.put ^ByteBuffer buf (duplicate suffix)))
-	  (apply concat
-	    (map #(write-bytes codec buf %) vs)
+	  (concat
+	    (mapcat #(write-bytes codec buf %) vs)
 	    [(duplicate suffix)]))))))
 
diff --git a/test/gloss/test/core.clj b/test/gloss/test/core.clj
@@ -116,6 +116,9 @@
   (test-roundtrip
     (repeated :byte :delimiters [64])
     (range 10))
+  (test-roundtrip
+    (repeated (string :utf-8 :delimiters ["/n"]) :delimiters ["/0"])
+    ["foo" "bar" "baz"])
   (test-roundtrip
     (repeated {:a :int32 :b :int32})
     (repeat 10 {:a 1 :b 2}))