Update to Java commit fba9b9a (2013.08.14): CLJ-1154 - Compile.main() should not close the output stream as this prevents reporting in subsequent calls (usually in tooling).

dmiller · dmiller · commit 97ec263fd5e8 · 2013-11-29T10:37:23.000-06:00
diff --git a/Clojure/Clojure.Compile/Compile.cs b/Clojure/Clojure.Compile/Compile.cs
@@ -89,7 +89,6 @@ static void Main(string[] args)
                 Var.popThreadBindings();
                 try {
                     outTW.Flush();
-                    outTW.Close();
                 }
                 catch ( IOException e)
                 {
diff --git a/Clojure/Clojure.Tests/clojure/test_clojure/compilation.clj b/Clojure/Clojure.Tests/clojure/test_clojure/compilation.clj
@@ -171,4 +171,31 @@
   (should-not-reflect #(loop [k 5.0] (recur (clojure.test-clojure.compilation/primfn 0))))
   
   (should-print-err-message #"(?s).*k is not matching primitive.*"
-    #(loop [k (clojure.test-clojure.compilation/primfn)] (recur :foo))))
+    #(loop [k (clojure.test-clojure.compilation/primfn)] (recur :foo))))
+
+;;;(deftest CLJ-1154-use-out-after-compile
+;;;  ;; This test creates a dummy file to compile, sets up a dummy
+;;;  ;; compiled output directory, and a dummy output stream, and
+;;;  ;; verifies the stream is still usable after compiling.
+;;;  (spit "test/dummy.clj" "(ns dummy)")
+;;;  (try
+;;;    (let [compile-path (System/getProperty "clojure.compile.path")
+;;;          tmp (java.io.File. "tmp")
+;;;          new-out (java.io.OutputStreamWriter. (java.io.ByteArrayOutputStream.))]
+;;;      (binding [clojure.core/*out* new-out]
+;;;        (try
+;;;          (.mkdir tmp)
+;;;          (System/setProperty "clojure.compile.path" "tmp")
+;;;          (clojure.lang.Compile/main (into-array ["dummy"]))
+;;;          (println "this should still work without throwing an exception" )
+;;;          (finally
+;;;            (if compile-path
+;;;              (System/setProperty "clojure.compile.path" compile-path)
+;;;              (System/clearProperty "clojure.compile.path"))
+;;;            (doseq [f (.listFiles tmp)]
+;;;              (.delete f))
+;;;            (.delete tmp)))))
+;;;    (finally
+;;;      (doseq [f (.listFiles (java.io.File. "test"))
+;;;              :when (re-find #"dummy.clj" (str f))]
+;;;        (.delete f)))))

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ static void Main(string[] args)`
`89`	`89`	`Var.popThreadBindings();`
`90`	`90`	`try {`
`91`	`91`	`outTW.Flush();`
`92`		`- outTW.Close();`
`93`	`92`	`}`
`94`	`93`	`catch ( IOException e)`
`95`	`94`	`{`