Ensure that await can be used in userland

clojure · Apr 16, 2012 · bbe598f · bbe598f
1 parent 9f11cfd
commit bbe598f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/clojure/clojure/tools/nrepl/middleware/session.clj b/src/main/clojure/clojure/tools/nrepl/middleware/session.clj
@@ -93,7 +93,9 @@
                   ; TODO is this something we need to consider in general, or is this
                   ; specific hack reasonable?
                   clojure.test/*test-out* out]
-          (atom (merge baseline-bindings (get-thread-bindings))
+          ; nrepl.server happens to use agents for connection dispatch
+          ; don't capture that *agent* binding for userland REPL sessions
+          (atom (merge baseline-bindings (dissoc (get-thread-bindings) #'*agent*))
             :meta {:id id
                    :stdin-reader in
                    :stdin-writer in-writer}))))))

diff --git a/src/test/clojure/clojure/tools/nrepl_test.clj b/src/test/clojure/clojure/tools/nrepl_test.clj
@@ -231,3 +231,9 @@
     (ack/reset-ack-port!)
     (with-open [s2 (server/start-server :ack-port (.getLocalPort (:ss @s)))]
       (is (= (.getLocalPort (:ss @s2)) (ack/wait-for-ack 10000))))))
+
+(def-repl-test agent-await
+  (is (= [42] (repl-values session (code (let [a (agent nil)]
+                                           (send a (fn [_] (Thread/sleep 1000) 42))
+                                           (await a)
+                                           @a))))))