@@ -25,11 +25,20 @@ (let [control (dothread-swank (thread-set-name "Swank Control Thread") - (control-loop conn)) + (try + (control-loop conn) + (catch Exception e + ;; fail silently + nil))) read (dothread-swank (thread-set-name "Read Loop Thread") - (read-loop conn control))] + (try + (read-loop conn control) + (catch Exception e + ;; This could be put somewhere better + (.interrupt control) + (dosync (alter *connections* (partial remove #{conn}))))))] (dosync (ref-set (conn :control-thread) control) (ref-set (conn :read-thread) read)))) src/swank/swank.clj @@ -2,13 +2,17 @@ (:use (swank util) (swank.util.concurrent thread))) -(defn read-chars [#^java.io.Reader rdr n] - (let [sb (StringBuilder.)] - (dotimes [i n] - (let [c (.read rdr)] - (when (not= c -1) - (.append sb (char c))))) - (str sb))) +(defn read-chars + ([rdr n] (read-chars rdr n false)) + ([#^java.io.Reader rdr n throw-exception] + (let [sb (StringBuilder.)] + (dotimes [i n] + (let [c (.read rdr)] + (if (not= c -1) + (.append sb (char c)) + (when throw-exception + (throw throw-exception))))) + (str sb)))) (defn call-on-flush-stream "Creates a stream that will call a given function when flushed." src/swank/util/io.clj 3df36ef0a9f8e54e4d53d6c9184dbccc4da0c096 1c9bf1df3dc6a3b0f0e5178b9f29c5baa88876ba Matt Revelle matt@mars.local http://github.com/mattrepl/swank-clojure/commit/e4aaef509a43028f29ce6e8e171d2d75b42b0c84 e4aaef509a43028f29ce6e8e171d2d75b42b0c84 2009-09-27T16:38:08-07:00 2009-09-27T16:38:08-07:00 Merge branch 'master' of git://github.com/jochu/swank-clojure d15cc45229aa6aa6a97339943eabaa2f8667fda2 Matt Revelle matt@mars.local