Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'demo' into development

Conflicts:
	project.clj
  • Loading branch information...
commit d15f8aadaca5eb6129938ca6b9800c0b86038b4f 2 parents 4d4b390 + 3827f65
@neotyk neotyk authored
Showing with 9 additions and 3 deletions.
  1. +5 −2 project.clj
  2. +4 −1 src/clj/http/async/client.clj
View
7 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})
View
5 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)))
Please sign in to comment.
Something went wrong with that request. Please try again.