Partial fix for ticket #41.

If the fsc server is already running, multiple concurrent compilation
attempts will now succeed.

However, if no fsc server is running, all of the clients will try to
launch one at the same time, with somewhat unpleasant results.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/compiler/scala/tools/util/SocketServer.scala b/src/compiler/scala/tools/util/SocketServer.scala
index 5c3db29e18..3c311f1c53 100644
--- a/src/compiler/scala/tools/util/SocketServer.scala
+++ b/src/compiler/scala/tools/util/SocketServer.scala
@@ -47,13 +47,13 @@ abstract class SocketServer {
   }
 
   def run() {
+    val serverSocket = try {
+      new ServerSocket(port)
+    } catch {
+      case e: IOException =>
+        fatal("Could not listen on port: " + port + "; exiting.")
+    }
     while (!shutDown) {
-      val serverSocket = try {
-        new ServerSocket(port)
-      } catch {
-        case e: IOException =>
-          fatal("Could not listen on port: " + port + "; exiting.")
-      }
       val clientSocket = try {
         serverSocket.accept()
       } catch {
@@ -73,8 +73,8 @@ abstract class SocketServer {
       out.close()
       in.close()
       clientSocket.close()
-      serverSocket.close()
     }
+    serverSocket.close()
   }
 
 }