Fix and tests for issue #404

Signed-off-by: Stuart Halloway <[email protected]>

Author: Rasmus Svensson

src/clj/clojure/java/io.clj

@@ -260,7 +260,7 @@
   IOFactory
   (assoc default-streams-impl
     :make-input-stream (fn [^Socket x opts] (.getInputStream x))
-    :output-stream (fn [^Socket x opts] (output-stream (.getOutputStream x) opts))))
+    :make-output-stream (fn [^Socket x opts] (.getOutputStream x))))
 
 (extend byte-array-type
   IOFactory

test/clojure/test_clojure/java/io.clj

@@ -8,10 +8,11 @@
 
 (ns clojure.test-clojure.java.io
   (:use clojure.test clojure.java.io)
-  (:import (java.io File FileInputStream BufferedInputStream
-                    FileOutputStream OutputStreamWriter InputStreamReader
+  (:import (java.io File BufferedInputStream
+                    FileInputStream InputStreamReader InputStream
+                    FileOutputStream OutputStreamWriter OutputStream
                     ByteArrayInputStream ByteArrayOutputStream)
-           (java.net URL URI)))
+           (java.net URL URI Socket ServerSocket)))
 
 (defn temp-file
   [prefix suffix]
@@ -193,3 +194,13 @@
     (is (not (.isDirectory (file tmp "test-make-parents" "child" "grandchild"))))
     (delete-file (file tmp "test-make-parents" "child"))
     (delete-file (file tmp "test-make-parents"))))
+
+(deftest test-socket-iofactory
+  (let [port 65321
+        server-socket (ServerSocket. port)
+        client-socket (Socket. "localhost" port)]
+    (try
+      (is (instance? InputStream (input-stream client-socket)))
+      (is (instance? OutputStream (output-stream client-socket)))
+      (finally (.close server-socket)
+               (.close client-socket)))))