diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-02-09 15:30:56 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-02-09 15:30:56 +0000 |
| commit | 7ae25e6ba89e0ec8b665d9bf12ff1b5e60de38d8 (patch) | |
| tree | 7e43529a3155020ed18def184304c18d2c5849cc | |
| parent | a35f1315940e444325b373255956a91d80e3405a (diff) | |
| download | scala-7ae25e6ba89e0ec8b665d9bf12ff1b5e60de38d8.tar.gz scala-7ae25e6ba89e0ec8b665d9bf12ff1b5e60de38d8.tar.bz2 scala-7ae25e6ba89e0ec8b665d9bf12ff1b5e60de38d8.zip | |
Fix for #934
| -rw-r--r-- | src/compiler/scala/tools/nsc/CompileClient.scala | 8 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/CompileSocket.scala | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileClient.scala b/src/compiler/scala/tools/nsc/CompileClient.scala index eef07526c3..013ce2a823 100644 --- a/src/compiler/scala/tools/nsc/CompileClient.scala +++ b/src/compiler/scala/tools/nsc/CompileClient.scala @@ -121,8 +121,12 @@ class StandardCompileClient { } def main(args: Array[String]) { - val status = main0(args) - exit(status) + try { + val status = main0(args) + exit(status) + } catch { + case e: Exception => exit(1) + } } } diff --git a/src/compiler/scala/tools/nsc/CompileSocket.scala b/src/compiler/scala/tools/nsc/CompileSocket.scala index 1e9dcfb2da..72b8a4a71e 100644 --- a/src/compiler/scala/tools/nsc/CompileSocket.scala +++ b/src/compiler/scala/tools/nsc/CompileSocket.scala @@ -50,7 +50,7 @@ class CompileSocket { protected def fatal(msg: String) = { error(msg) - exit(1) + throw new Exception("fsc failure") } protected def info(msg: String) = |