Fix missing return value in with-statement.

soasme · Sep 21, 2014 · 06416cb · 06416cb
1 parent 9d3a06c
commit 06416cb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/beanstalk_clj/core.clj b/src/beanstalk_clj/core.clj
@@ -154,8 +154,10 @@
    of all of the operations within the dynamic scope of body of code."
   [beanstalkd & body]
   `(binding [*beanstalkd* ~beanstalkd]
-     ~@body
-     (.close *beanstalkd*)))
+     (let [rs# (do ~@body)]
+       (.close *beanstalkd*)
+       rs#)))
+
 
 (defn inject-beanstalkd
   [multifn]

diff --git a/test/beanstalk_clj/core_test.clj b/test/beanstalk_clj/core_test.clj
@@ -295,3 +295,11 @@
        (is (= "ready" (:state (stats-job job))))
        (reserve)
        (delete jid)))))
+
+(deftest with-statement-return-value
+  (testing "return"
+    (is (number? (with-beanstalkd (beanstalkd-factory)
+      (let [jid (put "return")
+            job (reserve)]
+        (delete jid)
+        jid))))))