diff options
| author | Paul Phillips <paulp@improving.org> | 2009-08-31 20:19:46 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-08-31 20:19:46 +0000 |
| commit | d9a7d026ce8d48c9bf9d8eb669a3a9430105120e (patch) | |
| tree | a77ec5f73530c8370c99a0f0b8b1eac0c042b951 /src/compiler | |
| parent | c918b70784d41b0aa7efe5eea74e5ec7a4224421 (diff) | |
| download | scala-d9a7d026ce8d48c9bf9d8eb669a3a9430105120e.tar.gz scala-d9a7d026ce8d48c9bf9d8eb669a3a9430105120e.tar.bz2 scala-d9a7d026ce8d48c9bf9d8eb669a3a9430105120e.zip | |
One more try to unbreak fsc all the way.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/CompileServer.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/CompileSocket.scala | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/io/PlainFile.scala | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala index 37f57bb862..4e037201a4 100644 --- a/src/compiler/scala/tools/nsc/CompileServer.scala +++ b/src/compiler/scala/tools/nsc/CompileServer.scala @@ -145,7 +145,7 @@ class StandardCompileServer extends SocketServer private val redirectDir = (compileSocket.tmpDir / "output-redirects").ensureDirectory() private def redirect(setter: PrintStream => Unit, filename: String): Unit = - setter(new PrintStream((redirectDir / filename).createFile.bufferedOutput())) + setter(new PrintStream((redirectDir / filename).ensureFile.bufferedOutput())) def main(args: Array[String]) { redirect(System.setOut, "scala-compile-server-out.log") diff --git a/src/compiler/scala/tools/nsc/CompileSocket.scala b/src/compiler/scala/tools/nsc/CompileSocket.scala index 9b31cfe846..d65485d998 100644 --- a/src/compiler/scala/tools/nsc/CompileSocket.scala +++ b/src/compiler/scala/tools/nsc/CompileSocket.scala @@ -121,6 +121,7 @@ class CompileSocket { if (port < 0) startNewServer(vmArgs) + while (port < 0 && attempts < MaxAttempts) { attempts += 1 Thread.sleep(sleepTime) diff --git a/src/compiler/scala/tools/nsc/io/PlainFile.scala b/src/compiler/scala/tools/nsc/io/PlainFile.scala index 7e5e8576b1..359f062f41 100644 --- a/src/compiler/scala/tools/nsc/io/PlainFile.scala +++ b/src/compiler/scala/tools/nsc/io/PlainFile.scala @@ -77,7 +77,7 @@ class PlainFile(val givenPath: Path) extends AbstractFile { } /** Does this abstract file denote an existing file? */ - def create: Unit = if (!exists) givenPath.createFile() + def create: Unit = if (!exists) givenPath.ensureFile() /** Delete the underlying file or directory (recursively). */ def delete: Unit = |