Merge branch 'demo' into development

Conflicts: project.clj
cch1 · Oct 8, 2012 · d15f8aa · d15f8aa
2 parents 4d4b390 + 3827f65
commit d15f8aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/project.clj b/project.clj
@@ -5,7 +5,7 @@
   :source-paths ["src/clj"]
   :java-source-paths ["src/jvm"]
   :dependencies     [[org.clojure/clojure "1.4.0"]
-		     [com.ning/async-http-client "1.7.4"]]
+		     [com.ning/async-http-client "1.7.5"]]
   :min-lein-version "2.0.0"
   :plugins [[codox "0.6.1"]
             [lein-difftest "1.3.3"
@@ -21,4 +21,7 @@
   :codox {:output-dir "doc"}
   :autodoc {:web-src-dir "http://github.com/neotyk/http.async.client/blob/"
             :web-home "http://neotyk.github.com/http.async.client/autodoc/"
-            :copyright "Copyright 2012 Hubert Iwaniuk"})
+            :copyright "Copyright 2012 Hubert Iwaniuk"}
+  :licence {:name "Apache License, Version 2.0"
+            :url "http://www.apache.org/licenses/LICENSE-2.0"
+            :distribution :repo})
diff --git a/src/clj/http/async/client.clj b/src/clj/http/async/client.clj
@@ -220,7 +220,10 @@
       ((fn gen-next []
          (lazy-seq
           (let [v (.take b)]
-            (when-not (= ::done v)
+            (if (= ::done v)
+              (do
+                (.put b ::done)
+                nil)
               (cons v (gen-next)))))))
       b)))