Fix race condition btw onto-chan and closing chan

apa512 · Aug 4, 2015 · 016ef5a · 016ef5a
1 parent 770d30d
commit 016ef5a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/rethinkdb/net.clj b/src/rethinkdb/net.clj
@@ -63,7 +63,7 @@
         recv-loop (async/go-loop []
                     (when (try
                             (let [resp (read-response* in)]
-                              #_(println "Receiving:" resp)
+                              (println "Receiving:" resp)
                               (async/>! recv-chan resp))
                             (catch java.net.SocketException e
                               false))
@@ -179,7 +179,7 @@
             (case (int type)
               ;; 1 is a single result, 2 is a result sequence. However they are both wrapped in a vector
               ;; so onto-chan works correctly for both.
-              (1 2) (do (async/onto-chan result-chan parsed-resp true)
+              (1 2) (do (async/<! (async/onto-chan result-chan parsed-resp true)) ;; Need to wait for all values to go onto chan before closing
                         (clean-up :closed))
               ;; 3 is a partial sequence.
               3 (do (async/onto-chan result-chan parsed-resp false)